Andrew Hsieh
6162d4e848
Correct typo
...
See http://code.google.com/p/android/issues/detail?id=15134
Change-Id: I3eeed151949086fa132dc258d43bee21eab4af9b
2012-11-23 17:01:06 +08:00
Andrew Hsieh
28464f3b51
Check the presence of __STDC_VERSION__ in <sys/cdefs.h>
...
See http://code.google.com/p/android/issues/detail?id=14627
and bea05255de
2012-11-23 12:53:04 +08:00
Andrew Hsieh
3307379509
am 985a7d73: am 3de1121e: Merge "Refresh header byteswap.h and dirent.h"
...
* commit '985a7d73355b57bce4ed027b20643b337b9f541b':
Refresh header byteswap.h and dirent.h
2012-11-21 08:30:42 -08:00
Andrew Hsieh
985a7d7335
am 3de1121e: Merge "Refresh header byteswap.h and dirent.h"
...
* commit '3de1121e22d78b2ab22f57a392e7204ed073907f':
Refresh header byteswap.h and dirent.h
2012-11-21 08:28:29 -08:00
Andrew Hsieh
3de1121e22
Merge "Refresh header byteswap.h and dirent.h"
2012-11-21 08:14:45 -08:00
Andrew Hsieh
279fe064b1
Refresh header byteswap.h and dirent.h
...
Sync with bionic. No new APIs.
Change-Id: Ie1f71d1c56ce2d0574d8b743f205115d2fbc68b4
2012-11-21 14:17:01 +08:00
Andrew Hsieh
c09c6bfbfc
am ad6edf1d: am 5591a960: Merge "Fix limits.h to include page.h which provides PAGE_SIZE"
...
* commit 'ad6edf1d186a6377b407c142453159840bc0bb26':
Fix limits.h to include page.h which provides PAGE_SIZE
2012-11-20 19:10:50 -08:00
Andrew Hsieh
ad6edf1d18
am 5591a960: Merge "Fix limits.h to include page.h which provides PAGE_SIZE"
...
* commit '5591a960038d742a936e62fd05ab29adc673fc7f':
Fix limits.h to include page.h which provides PAGE_SIZE
2012-11-20 19:08:40 -08:00
Andrew Hsieh
5591a96003
Merge "Fix limits.h to include page.h which provides PAGE_SIZE"
2012-11-20 19:01:09 -08:00
Andrew Hsieh
2eb9332422
Fix limits.h to include page.h which provides PAGE_SIZE
...
See 6331db3fd251ddc350913cc1e8a7941740c25f63 and
http://code.google.com/p/android/issues/detail?id=39983
Change-Id: I85083d754fe9b722efcb8ea73f17d88d505c90d1
2012-11-20 16:14:06 +08:00
The Android Automerger
4f4abab001
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
2012-11-19 16:12:54 -08:00
Scott Main
6feaf1d0df
am 4a4e1219: am 21e38c7f: am 892fae16: am f394e166: docs: update redirects for articles
...
* commit '4a4e121974ae3b4a71fe8cf19f00cf564def2b03':
docs: update redirects for articles
2012-11-16 11:37:20 -08:00
The Android Automerger
57281e9a0d
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
2012-11-16 11:29:16 -08:00
Scott Main
50a167059e
am d0f76c87: am 29808c07: am 763f9b7a: am e1e1a999: docs: add redirects for best practices pages that moved to training
...
* commit 'd0f76c870c407ebdbf608dac27a7fb38fdd1c4fd':
docs: add redirects for best practices pages that moved to training
2012-11-16 10:43:14 -08:00
Scott Main
4a4e121974
am 21e38c7f: am 892fae16: am f394e166: docs: update redirects for articles
...
* commit '21e38c7fe11313beca9394b0d60bdc9dd1cfcd0a':
docs: update redirects for articles
2012-11-16 09:55:13 -08:00
Scott Main
21e38c7fe1
am 892fae16: am f394e166: docs: update redirects for articles
...
* commit '892fae16468840d19c48a8829ad3fbc214ca82ff':
docs: update redirects for articles
2012-11-16 09:53:47 -08:00
Scott Main
892fae1646
am f394e166: docs: update redirects for articles
...
* commit 'f394e166a0f96c7851445c2a38a9457b9581ddc4':
docs: update redirects for articles
2012-11-16 09:52:23 -08:00
Marco Nelissen
66e9e710a4
Merge "Add gsm decoder to media codec list"
2012-11-16 09:21:20 -08:00
Scott Main
f394e166a0
docs: update redirects for articles
...
Change-Id: Ia2db76f0b9cc07878ecdc1e673cd1ae376b0447f
2012-11-16 08:57:44 -08:00
Marco Nelissen
6cebef011f
Add gsm decoder to media codec list
...
b/6620569
Change-Id: I9c41bd34e931bb59405146931dfc12a00a423ef5
2012-11-16 07:42:30 -08:00
Scott Main
d0f76c870c
am 29808c07: am 763f9b7a: am e1e1a999: docs: add redirects for best practices pages that moved to training
...
* commit '29808c0797f8c4bcdd14cf5cda0cfde5f10adfc9':
docs: add redirects for best practices pages that moved to training
2012-11-15 18:30:13 -08:00
Scott Main
29808c0797
am 763f9b7a: am e1e1a999: docs: add redirects for best practices pages that moved to training
...
* commit '763f9b7aa82fd7a690b729d647e0238f6bf0330a':
docs: add redirects for best practices pages that moved to training
2012-11-15 18:27:44 -08:00
Scott Main
763f9b7aa8
am e1e1a999: docs: add redirects for best practices pages that moved to training
...
* commit 'e1e1a999e8c71604a0fa30adb1096d3645e8ba14':
docs: add redirects for best practices pages that moved to training
2012-11-15 18:25:55 -08:00
Scott Main
e1e1a999e8
docs: add redirects for best practices pages that moved to training
...
Change-Id: I0dd79fb863d50b0dd2f0f7d53babe345888f0f78
2012-11-15 17:47:44 -08:00
The Android Open Source Project
97013f483d
am 355cec04: (-s ours) Reconcile with jb-mr1.1-release - do not merge
...
* commit '355cec04df1440cc5b14c206bb1bdc97657a5bf5':
2012-11-14 12:42:51 -08:00
The Android Open Source Project
355cec04df
Reconcile with jb-mr1.1-release - do not merge
...
Change-Id: I5f004fa3b810c03dbb419f13e5767ede992f509d
2012-11-14 12:40:51 -08:00
Scott Main
687bb9b854
am e2ea36c5: am 3206485f: am 95715d22: am 42801496: docs: a few bonus redirects for dac
...
* commit 'e2ea36c55fd5fb2b7dce128468cf1fbc191f70ea':
docs: a few bonus redirects for dac
2012-11-14 11:37:44 -08:00
Scott Main
e2ea36c55f
am 3206485f: am 95715d22: am 42801496: docs: a few bonus redirects for dac
...
* commit '3206485f9ea5156694467ba921d58d02bf6a07e9':
docs: a few bonus redirects for dac
2012-11-14 11:36:28 -08:00
Scott Main
3206485f9e
am 95715d22: am 42801496: docs: a few bonus redirects for dac
...
* commit '95715d2208766587c1fd0a3440beecba1ea5ef99':
docs: a few bonus redirects for dac
2012-11-14 11:34:14 -08:00
Scott Main
95715d2208
am 42801496: docs: a few bonus redirects for dac
...
* commit '42801496cff122e26abb34c09b79fa60135a02ea':
docs: a few bonus redirects for dac
2012-11-14 11:32:44 -08:00
The Android Automerger
2d7f1fafc2
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
2012-11-14 11:27:52 -08:00
Scott Main
42801496cf
docs: a few bonus redirects for dac
...
Change-Id: I01743d0032ebe707125121e84d741d4d39ca5540
2012-11-14 09:59:12 -08:00
Scott Main
f5ff3bfc26
am 03c5eadb: am 55d6a11d: am cd18b809: am 2df7c91d: am 87525f60: am 09d8f21c: am e242276c: docs: redirect next steps to building first app class
...
* commit '03c5eadb74f7f91a06fafb664e0ba7c7a2d29419':
docs: redirect next steps to building first app class
2012-11-12 20:01:02 -08:00
Scott Main
03c5eadb74
am 55d6a11d: am cd18b809: am 2df7c91d: am 87525f60: am 09d8f21c: am e242276c: docs: redirect next steps to building first app class
...
* commit '55d6a11dd62be8296d1c5d943ca9a7fcb9e2cb2b':
docs: redirect next steps to building first app class
2012-11-12 19:58:09 -08:00
Scott Main
55d6a11dd6
am cd18b809: am 2df7c91d: am 87525f60: am 09d8f21c: am e242276c: docs: redirect next steps to building first app class
...
* commit 'cd18b80902d862211b4116e65d2473de1c1f0b44':
docs: redirect next steps to building first app class
2012-11-12 19:55:23 -08:00
Scott Main
cd18b80902
am 2df7c91d: am 87525f60: am 09d8f21c: am e242276c: docs: redirect next steps to building first app class
...
* commit '2df7c91d5f93a91f23c54239de5ac49d06ee1554':
docs: redirect next steps to building first app class
2012-11-12 19:52:49 -08:00
Scott Main
2df7c91d5f
am 87525f60: am 09d8f21c: am e242276c: docs: redirect next steps to building first app class
...
* commit '87525f600943f36697c85c22555463bb199afc2f':
docs: redirect next steps to building first app class
2012-11-12 19:50:56 -08:00
Scott Main
87525f6009
am 09d8f21c: am e242276c: docs: redirect next steps to building first app class
...
* commit '09d8f21c0b9531d1d2615a737b256da4f29d27bf':
docs: redirect next steps to building first app class
2012-11-12 19:47:51 -08:00
Scott Main
09d8f21c0b
am e242276c: docs: redirect next steps to building first app class
...
* commit 'e242276c5b021c6219b31e9a40e126b633f15deb':
docs: redirect next steps to building first app class
2012-11-12 19:45:49 -08:00
Andy Stadler
819950decd
am ee062480: am 623e45b7: am e9a06346: am 18bc76ab: Cleanup eclipse .classpath for Gallery2
...
* commit 'ee062480adcacde89e0ed1a04e8d0e34faa3e42c':
Cleanup eclipse .classpath for Gallery2
2012-11-12 16:15:54 -08:00
Andy Stadler
ee062480ad
am 623e45b7: am e9a06346: am 18bc76ab: Cleanup eclipse .classpath for Gallery2
...
* commit '623e45b7eec12cde5d77db2cdcbd276c5b245d2f':
Cleanup eclipse .classpath for Gallery2
2012-11-12 16:13:40 -08:00
Andy Stadler
623e45b7ee
am e9a06346: am 18bc76ab: Cleanup eclipse .classpath for Gallery2
...
* commit 'e9a0634689298458077de62186b6a85c4ff2324b':
Cleanup eclipse .classpath for Gallery2
2012-11-12 16:11:58 -08:00
Andy Stadler
e9a0634689
am 18bc76ab: Cleanup eclipse .classpath for Gallery2
...
* commit '18bc76ab25b105af2d26c5456e0937e139b3203b':
Cleanup eclipse .classpath for Gallery2
2012-11-12 16:09:36 -08:00
Andy Stadler
18bc76ab25
Cleanup eclipse .classpath for Gallery2
...
A couple of minor fixes to make eclipse happy.
Change-Id: Id9a30778efd3ef18e45efe316402971ca72a7c60
2012-11-12 14:40:23 -08:00
Andy Stadler
afa0c3fbbb
am a103fc1e: Cleanup eclipse .classpath for Gallery2
...
* commit 'a103fc1e4ed59001673ca28ddf0dabde9b2c0f01':
Cleanup eclipse .classpath for Gallery2
2012-11-12 13:50:28 -08:00
Andy Stadler
a103fc1e4e
Cleanup eclipse .classpath for Gallery2
...
A couple of minor fixes to make eclipse happy.
Change-Id: Id9a30778efd3ef18e45efe316402971ca72a7c60
2012-11-12 13:42:25 -08:00
Marco Nelissen
3cab67467e
Add video for VideoView demo
...
Add one of the CTS test videos so the demo works out of the box, and
make the video fill the screen instead of hardcoding it to a tiny size.
Change-Id: Ie26a4ae0e186fe966d0679b088492a0c7d035713
2012-11-09 14:46:52 -08:00
The Android Open Source Project
e761ab8fed
am 37ca54d2: (-s ours) am 62ea063d: am 7cb8e4ae: Reconcile with jb-mr1-release - do not merge
...
* commit '37ca54d2a212cd4c1cb4ebf7d3a6cabb1748fe7b':
2012-11-08 06:31:49 -08:00
The Android Open Source Project
37ca54d2a2
am 62ea063d: am 7cb8e4ae: Reconcile with jb-mr1-release - do not merge
...
* commit '62ea063df0c96ff549e1fe6d4bbdbf4836f23d3d':
2012-11-08 06:26:56 -08:00
Xavier Ducrohet
66eba00914
am 0a5b1596: am 42a111e5: am 9350dd44: am 85c1f088: revert API 17 system image to rev 1.
...
* commit '0a5b159698c94b718e6fd7395fb511b3476899d0':
revert API 17 system image to rev 1.
2012-11-08 06:17:41 -08:00
