Scott Main
80be48a177
am e1ec055d: docs: a bunch of new reidrects; for search, videos, hello views, and a bunch of easter eggs
...
* commit 'e1ec055dea478b3cd00f1a2ec8d544f2156a19a6':
docs: a bunch of new reidrects; for search, videos, hello views, and a bunch of easter eggs
2012-06-27 01:36:30 -07:00
Scott Main
e1ec055dea
docs: a bunch of new reidrects;
...
for search, videos, hello views, and a bunch of easter eggs
Change-Id: I13a8e6c0971292fb6036c307e2cbf2c4c07eca84
2012-06-27 01:19:25 -07:00
Scott Main
2788b323bb
am c0585227: am 97324cf4: Merge "docs: submit latest set of redirects" into jb-dev
...
* commit 'c058522799ee101b1e7b1d64b29756287631bb56':
docs: submit latest set of redirects
2012-06-26 22:03:40 -07:00
Scott Main
c058522799
am 97324cf4: Merge "docs: submit latest set of redirects" into jb-dev
...
* commit '97324cf453303e8e191d9268551a0928e828cd36':
docs: submit latest set of redirects
2012-06-26 22:01:16 -07:00
Scott Main
97324cf453
Merge "docs: submit latest set of redirects" into jb-dev
2012-06-26 21:58:53 -07:00
Scott Main
14c36089d8
docs: submit latest set of redirects
...
Change-Id: I4bb033e0e6689bef328dddef1d28e4b2cbecb06d
2012-06-26 21:57:14 -07:00
Andrew Hsieh
1bb41f7724
am b6759b16: am c7c40b68: Merge "ndk: Add crtbrand.c ; crtbegin_static.S includes "atexit.S" for x86/mips"
...
* commit 'b6759b1620daad7900aa4adcfc54425f0bcfd224':
ndk: Add crtbrand.c ; crtbegin_static.S includes "atexit.S" for x86/mips
2012-06-26 14:36:45 -07:00
Andrew Hsieh
b6759b1620
am c7c40b68: Merge "ndk: Add crtbrand.c ; crtbegin_static.S includes "atexit.S" for x86/mips"
...
* commit 'c7c40b68a22e1d52d906b89f4fa43dc93f3aeecf':
ndk: Add crtbrand.c ; crtbegin_static.S includes "atexit.S" for x86/mips
2012-06-26 14:34:03 -07:00
Andrew Hsieh
c7c40b68a2
Merge "ndk: Add crtbrand.c ; crtbegin_static.S includes "atexit.S" for x86/mips"
2012-06-26 14:22:50 -07:00
Anirudh Dewani
672fa25cea
WiFi Direct Service Discovery sample
...
Change-Id: Id5ac219cbf03a8a96203ed682f729df9bbb59fcd
2012-06-26 14:06:59 -07:00
Andrew Hsieh
5e30a6ae14
ndk: Add crtbrand.c ; crtbegin_static.S includes "atexit.S" for x86/mips
...
"atexit" isn't defined in libc.a for x86/mips (unlike their arm's counterpart).
Include atexit.S otherwise app using atexit() may fail to link statically.
Also, add crtbegin.c to brand crtbegin_static/dynamic.c with .note.ABI-tag
section of given API level. See $NDK/gen-platforms.sh
Change-Id: I2fdbb92119e3ca2da2c1ced6d77e63136ec35c34
2012-06-25 17:58:12 -07:00
The Android Open Source Project
dec6957c4e
am edc463c5: Reconcile with jb-release
...
* commit 'edc463c5df0678a02140e7ead7f87f4b35f64cc4':
2012-06-22 15:22:02 -07:00
The Android Open Source Project
edc463c5df
Reconcile with jb-release
...
Change-Id: If02a97e5db71339a785db874c40b20905169bd10
2012-06-22 15:20:11 -07:00
The Android Automerger
af9c383a63
merge in jb-release history after reset to jb-dev
2012-06-22 15:04:25 -07:00
The Android Open Source Project
17ccbe0247
am d38cf456: Reconcile with jb-release
...
* commit 'd38cf456ad1e4b8c2f04d23b32d2c105e866ae33':
2012-06-22 12:39:24 -07:00
The Android Open Source Project
d38cf456ad
Reconcile with jb-release
...
Change-Id: Ia28fbfff99d30bf1f119f20b0265d96e8c3ddacd
2012-06-22 12:37:04 -07:00
Jesse Hall
06e59a30ce
Merge "Update to renamed ANativeWindow methods"
2012-06-22 09:59:50 -07:00
Raphael Moll
b42e750ab4
am 11b954f6: am 7fa6b8dd: Update SDK Windows USB driver definition.
...
* commit '11b954f619d5d784b9c8aa0db5e9d56631670121':
Update SDK Windows USB driver definition.
2012-06-22 09:59:19 -07:00
Raphael Moll
11b954f619
am 7fa6b8dd: Update SDK Windows USB driver definition.
...
* commit '7fa6b8dd1bcc351bd29e437eb3cb9f2acc7d7eb9':
Update SDK Windows USB driver definition.
2012-06-22 09:57:15 -07:00
The Android Automerger
fc7276f9a8
merge in jb-release history after reset to jb-dev
2012-06-22 09:47:45 -07:00
Raphael Moll
7fa6b8dd1b
Update SDK Windows USB driver definition.
...
Change-Id: Ia4ad0453599476eea72fcd90f7c200ec57490d3f
2012-06-22 09:43:25 -07:00
Scott Main
eaeca43a2e
am a7db9092: am 8189fcfa: merge redirects file from ics and add redirects for tutorials
...
* commit 'a7db90927591ff03f3bf21dd945a356361371c69':
merge redirects file from ics and add redirects for tutorials
2012-06-21 23:24:55 -07:00
Scott Main
a7db909275
am 8189fcfa: merge redirects file from ics and add redirects for tutorials
...
* commit '8189fcfacbb3c5959ea74e346ee93c20c8e02dcd':
merge redirects file from ics and add redirects for tutorials
2012-06-21 23:21:40 -07:00
Jesse Hall
e705cdde0d
Update to renamed ANativeWindow methods
...
A few ANativeWindow methods were updatd to take a Sync HAL file
descriptor, and the existing methods were renamed with a _DEPRECATED
suffix. Since the emulator graphics acceleration doesn't yet support
the sync HAL, this change continues calling the deprecated functions
via their new names.
Change-Id: I5b1760811fafb6723ede887e32e63f94cbaeffe5
2012-06-21 23:16:56 -07:00
Scott Main
8189fcfacb
merge redirects file from ics and add redirects for tutorials
...
Change-Id: I28b64f6e48d6363a3c89a4e34f87db458d29e2b8
2012-06-21 23:15:53 -07:00
Xavier Ducrohet
c5fd927f4a
am 8f38da3d: am e8f7f5fe: Fix WXGA800-7in to be portrait by default.
...
* commit '8f38da3deff60c9d5cac0b355c2d95d967216828':
Fix WXGA800-7in to be portrait by default.
2012-06-21 19:41:14 -07:00
Xavier Ducrohet
8f38da3def
am e8f7f5fe: Fix WXGA800-7in to be portrait by default.
...
* commit 'e8f7f5fe9f08c2381908d13a63fc34b12d6f95c3':
Fix WXGA800-7in to be portrait by default.
2012-06-21 19:39:13 -07:00
Xavier Ducrohet
e8f7f5fe9f
Fix WXGA800-7in to be portrait by default.
...
Bug: 6712001
Change-Id: I047e023e726f83ff63f8fe00fb3f43698ad1db37
2012-06-21 19:33:26 -07:00
Xavier Ducrohet
4700bc72de
am 52c627a5: am 5ff9fd62: Merge "Update the API 16 files used by the SDK." into jb-dev
...
* commit '52c627a543113a0279237f691ac26608b67cd66d':
Update the API 16 files used by the SDK.
2012-06-21 18:24:18 -07:00
Xavier Ducrohet
52c627a543
am 5ff9fd62: Merge "Update the API 16 files used by the SDK." into jb-dev
...
* commit '5ff9fd62fb0eca575c55c3dd3d0484396f42d4e3':
Update the API 16 files used by the SDK.
2012-06-21 18:22:39 -07:00
Xavier Ducrohet
5ff9fd62fb
Merge "Update the API 16 files used by the SDK." into jb-dev
2012-06-21 18:20:41 -07:00
Xavier Ducrohet
1e493205ac
Update the API 16 files used by the SDK.
...
Change-Id: I0ee375c93522cff1add504fc19081e25c131627e
2012-06-21 17:48:38 -07:00
Martijn Coenen
a0e3ce5db6
am 56f8408e: (-s ours) am 0c3d438a: Fix NPE in BeamDemo if NFC not present. do not merge.
...
* commit '56f8408e43d0ac9e36aab6a34fbdf90398aa4377':
Fix NPE in BeamDemo if NFC not present. do not merge.
2012-06-21 17:22:57 -07:00
Martijn Coenen
56f8408e43
am 0c3d438a: Fix NPE in BeamDemo if NFC not present. do not merge.
...
* commit '0c3d438a930d905e23ba2148ffccdbdc03851189':
Fix NPE in BeamDemo if NFC not present. do not merge.
2012-06-21 17:20:59 -07:00
Martijn Coenen
0c3d438a93
Fix NPE in BeamDemo if NFC not present. do not merge.
...
Bug: 6711303
(cherry picked from commit 76aca97d26 )
Change-Id: I626d060bf2951c213679685dc57ee2eda7398da2
2012-06-21 17:18:26 -07:00
Martijn Coenen
cc59ae597c
Merge "Fix NPE in BeamDemo if NFC not present."
2012-06-21 16:02:57 -07:00
Martijn Coenen
76aca97d26
Fix NPE in BeamDemo if NFC not present.
...
Bug: 6711303
Change-Id: Iad6abab3ea2ca53247ed4e3b5149e052bd92453b
2012-06-21 15:26:47 -07:00
Keun young Park
540e276c72
Merge "remove development/data/etc/*"
2012-06-20 09:47:31 -07:00
The Android Open Source Project
555e713d03
am 976643f7: Reconcile with jb-release
...
* commit '976643f72db71a82b6d27d356bb30e4e1cd64504':
2012-06-20 08:28:18 -07:00
The Android Open Source Project
976643f72d
Reconcile with jb-release
...
Change-Id: I43a365794949df0e50d3afd06642d67c33dd2e09
2012-06-20 08:25:35 -07:00
The Android Automerger
41e8cdbdbb
merge in jb-release history after reset to jb-dev
2012-06-20 07:00:13 -07:00
Keun young Park
3aa86bfd7b
remove development/data/etc/*
...
- migrated to device/generic/goldfish/data/etc
Change-Id: If8dd71c6e6db5a79ec56efbba2fc28e592971ee4
2012-06-19 18:27:27 -07:00
Xavier Ducrohet
16a94a4be4
am 2418f22b: am ddb532df: Support lib is now in rev 9
...
* commit '2418f22bf19b16427c44f9240b0e1f2c857e0610':
Support lib is now in rev 9
2012-06-19 18:05:16 -07:00
Xavier Ducrohet
2418f22bf1
am ddb532df: Support lib is now in rev 9
...
* commit 'ddb532df5831dd8067842b4ffaee241a2f9b2ce6':
Support lib is now in rev 9
2012-06-19 18:02:44 -07:00
Xavier Ducrohet
ddb532df58
Support lib is now in rev 9
...
Change-Id: Ie88b3dcd91a1e244f7599240d43c5bb7f7833ce2
2012-06-19 18:00:34 -07:00
Xavier Ducrohet
8d7fa1d1ac
am e4ac28db: am ffd4e751: Merge "Add Platform.CodeName to source.properties" into jb-dev
...
* commit 'e4ac28dbd4ab7fdd2671f3894f63804af074f98e':
Add Platform.CodeName to source.properties
2012-06-19 16:34:34 -07:00
Xavier Ducrohet
e4ac28dbd4
am ffd4e751: Merge "Add Platform.CodeName to source.properties" into jb-dev
...
* commit 'ffd4e751ac3f736b5fb5d9fbfeebb07c6c7d04c2':
Add Platform.CodeName to source.properties
2012-06-19 16:32:15 -07:00
Xavier Ducrohet
ffd4e751ac
Merge "Add Platform.CodeName to source.properties" into jb-dev
2012-06-19 16:30:05 -07:00
Xavier Ducrohet
f5d811e71f
Add Platform.CodeName to source.properties
...
This does not use the placeholder because it doesn't seem
to work when the platform loses its codename.
Change-Id: I98a828915fe23f2fb777e329289303f17b05a60e
2012-06-19 16:28:25 -07:00
Alexander Lucas
3082564e7d
am d281a34e: am 8a8046a9: Initial commit of NsdChat application
...
* commit 'd281a34e15d6687d747812cca513d5ee98624866':
Initial commit of NsdChat application
2012-06-19 11:38:41 -07:00