The Android Automerger
5fa38ef9c8
merge in jb-release history after reset to jb-dev
2012-07-02 12:53:28 -07:00
Scott Main
f0ed2542e3
am 0a2b01dc: am 2eb9e372: docs: fix markup error in redirects
...
* commit '0a2b01dc51dd364166d81c5e73fe2b2c84a4f5d9':
docs: fix markup error in redirects
2012-06-29 19:07:15 -07:00
Scott Main
0a2b01dc51
am 2eb9e372: docs: fix markup error in redirects
...
* commit '2eb9e3727e2e8176607356f8972a6b7bf61d02aa':
docs: fix markup error in redirects
2012-06-29 19:04:26 -07:00
Scott Main
2eb9e3727e
docs: fix markup error in redirects
...
Change-Id: I974e479335db96e9c03a919c613d827bbd11c7e8
2012-06-29 19:01:11 -07:00
The Android Open Source Project
3bada874ab
am 61a2d05f: Reconcile with jb-release
...
* commit '61a2d05fe351250f8378cfccdf65b283200151cd':
2012-06-29 18:32:53 -07:00
The Android Open Source Project
61a2d05fe3
Reconcile with jb-release
...
Change-Id: Ic2cf7300da4e96389dd6fb0613f53b234ba14230
2012-06-29 18:28:19 -07:00
Scott Main
e5af087fb1
am bf298b99: am d8557b08: docs: add redirects for faq and notepad docs
...
* commit 'bf298b9968f87617fae2979a3ef02f38e1a745e8':
docs: add redirects for faq and notepad docs
2012-06-29 16:36:32 -07:00
Scott Main
bf298b9968
am d8557b08: docs: add redirects for faq and notepad docs
...
* commit 'd8557b08db48172fa09f0cf54ec694416878b09c':
docs: add redirects for faq and notepad docs
2012-06-29 16:31:41 -07:00
Scott Main
d8557b08db
docs: add redirects for faq and notepad docs
...
Change-Id: I45c1d3d1c0b134e59eb8b51e4083bf976ca30adc
2012-06-29 16:12:28 -07:00
The Android Automerger
91e18ee9c5
merge in jb-release history after reset to jb-dev
2012-06-29 15:48:48 -07:00
Scott Main
433aa1a675
am 0fdce9c4: am 6b78d89d: docs: more redirects
...
* commit '0fdce9c4a83e34289e9f07a50405b39954ace86a':
docs: more redirects
2012-06-29 14:42:53 -07:00
Scott Main
0fdce9c4a8
am 6b78d89d: docs: more redirects
...
* commit '6b78d89d3e097072c9502bcabd2b4a106bee0fe6':
docs: more redirects
2012-06-29 14:39:30 -07:00
Scott Main
6b78d89d3e
docs: more redirects
...
Change-Id: Ib694902e574630b91fc11ae5cce917a87cea8aff
2012-06-29 14:33:08 -07:00
Andrew Hsieh
397c2ef4f0
am 05ad86e9: am 435a7da6: Merge "Fix SEGV when unwinding stack pasts __libc_init"
...
* commit '05ad86e92d96fd9e649f4638876b1efc3f1edc00':
Fix SEGV when unwinding stack pasts __libc_init
2012-06-29 10:12:57 -07:00
Andrew Hsieh
05ad86e92d
am 435a7da6: Merge "Fix SEGV when unwinding stack pasts __libc_init"
...
* commit '435a7da6d02083ba6583e1654db351991cf79578':
Fix SEGV when unwinding stack pasts __libc_init
2012-06-29 10:09:27 -07:00
Andrew Hsieh
435a7da6d0
Merge "Fix SEGV when unwinding stack pasts __libc_init"
2012-06-29 09:48:23 -07:00
The Android Open Source Project
e63b62d364
am 82bde8f8: Reconcile with jb-release
...
* commit '82bde8f8661400798eb7718430c71d9d90b78844':
2012-06-29 08:16:24 -07:00
The Android Open Source Project
82bde8f866
Reconcile with jb-release
...
Change-Id: Ic998abfb4db322b73faf97b0cf4571a4344672bd
2012-06-29 08:13:36 -07:00
Andrew Hsieh
556182feb4
Fix SEGV when unwinding stack pasts __libc_init
...
Changed "jump __libc_init" to "call __libc_init" otherwise stack unwinding
past __libc_init may get wrong return address and crash the program or do
wield things. With "call", return address is pushed on stack and unwinding
stops correctly at _start. Note that __libc_init never returns, so this
fix wonʼt affect normal program execution. But just in case it "does"
return, jump to address 0 and halt.
Change-Id: Id194fb32adcbf89ae59939cee33c50b5bbdd36fe
2012-06-28 14:28:21 -07:00
Andrew Hsieh
f951aa2817
am ab2b744a: am 568cb2b2: Merge "Fixed wrong package names in samples hello-jni and two-libs"
...
* commit 'ab2b744a77d3a47ded71741848ede5e888625571':
Fixed wrong package names in samples hello-jni and two-libs
2012-06-28 10:24:01 -07:00
Andrew Hsieh
ab2b744a77
am 568cb2b2: Merge "Fixed wrong package names in samples hello-jni and two-libs"
...
* commit '568cb2b2ef150704f52c5ec96d9e835b37ea6938':
Fixed wrong package names in samples hello-jni and two-libs
2012-06-28 10:20:52 -07:00
Andrew Hsieh
568cb2b2ef
Merge "Fixed wrong package names in samples hello-jni and two-libs"
2012-06-28 09:57:23 -07:00
The Android Automerger
0525bed8df
merge in jb-release history after reset to jb-dev
2012-06-27 14:05:22 -07:00
Andrew Hsieh
1513e9eab2
Fixed wrong package names in samples hello-jni and two-libs
...
Fixed package names so tests project underneath can compile
Change-Id: Ia4e58e8caa5db65e05fdb2ec64e52c1564774899
2012-06-27 11:29:31 -07:00
Scott Main
981bc9d8db
am 80be48a1: am e1ec055d: docs: a bunch of new reidrects; for search, videos, hello views, and a bunch of easter eggs
...
* commit '80be48a1771750a0da8d7145158f2fb3f11f4766':
docs: a bunch of new reidrects; for search, videos, hello views, and a bunch of easter eggs
2012-06-27 01:39:28 -07:00
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