Dianne Hackborn
5b6b540207
New development tool for creating cache files.
...
Change-Id: I5d4bc5f41a08225a618f68b7afb3b5b3037d96d6
2012-07-12 14:50:08 -07:00
The Android Automerger
9115e9a11d
merge in jb-mr0-release history after reset to jb-dev
2012-07-11 23:12:01 -07:00
Wink Saville
25fc64f00a
Merge commit 'e8617bcc' into mit
...
* commit 'e8617bcc':
Use telephony-common and mms-common.
2012-07-11 17:48:31 -07:00
Eino-Ville Talvala
3461561ccf
gralloc: Support HAL_PIXEL_FORMAT_YCrCb_420_SP (NV21)
...
This is needed for Camera HAL2 video recording.
Bug: 6243944
Change-Id: I47a3e65117881612fb95068a80f811cc8378fbc6
2012-07-11 17:21:18 -07:00
Andy Stadler
9aebc408d4
Merge "Eclipse classpath maintenance"
2012-07-11 15:34:57 -07:00
Andy Stadler
a2a3bab1af
Eclipse classpath maintenance
...
* Email -> Email2
* Add frameworks/ex/photoviewer
* Remove filterfw_intermediates
Change-Id: I9b3dfcde9d9ed7bdddbab1d9f07e4cfe60658d10
2012-07-11 15:33:58 -07:00
Wink Saville
e8617bccd0
Use telephony-common and mms-common.
...
Change-Id: If2e6b49eb9ceafc43de107ce761163c654f3ee35
2012-07-11 14:57:38 -07:00
Xavier Ducrohet
37598e72e8
am c79d71b4: (-s ours) am 9649059f: Prepare rev 2 of platform pkg for jb. do not merge.
...
* commit 'c79d71b4cb58dbbd95bf65daf3f71d698a930b5e':
Prepare rev 2 of platform pkg for jb. do not merge.
2012-07-10 11:53:06 -07:00
Xavier Ducrohet
c79d71b4cb
am 9649059f: Prepare rev 2 of platform pkg for jb. do not merge.
...
* commit '9649059fa0d764845d8e4ebeef17d54a6aaf8a41':
Prepare rev 2 of platform pkg for jb. do not merge.
2012-07-10 11:51:25 -07:00
Xavier Ducrohet
9649059fa0
Prepare rev 2 of platform pkg for jb. do not merge.
...
Change-Id: I7358b0d482df19668e75f20240fd3795870724d8
2012-07-09 18:43:31 -07:00
Scott Main
15060a5ca7
am 43eb9a78: (-s ours) am 3e926e05: Merge "Update doc package to r2. do not merge." into jb-dev
...
* commit '43eb9a78c3ca49c0e4de95a3f048bc0b9c6acc82':
Update doc package to r2. do not merge.
2012-07-03 14:26:29 -07:00
Scott Main
43eb9a78c3
am 3e926e05: Merge "Update doc package to r2. do not merge." into jb-dev
...
* commit '3e926e05d35c62b8e51defcdae8f099ebe92d3ed':
Update doc package to r2. do not merge.
2012-07-03 14:22:39 -07:00
Scott Main
3e926e05d3
Merge "Update doc package to r2. do not merge." into jb-dev
2012-07-03 14:19:41 -07:00
Xavier Ducrohet
3c41c70f0d
Update doc package to r2. do not merge.
...
Change-Id: Ifb87031e2b26b68e8d8c6329d5a33de04ef6681f
2012-07-03 14:18:52 -07:00
The Android Open Source Project
d86deb31a5
am d0ba66de: Reconcile with jb-release
...
* commit 'd0ba66decf9c5890bdcb8d98112efa319aefa008':
2012-07-03 13:33:13 -07:00
The Android Open Source Project
d0ba66decf
Reconcile with jb-release
...
Change-Id: I937a350902e0c3aa128d9f33f67994099da8a634
2012-07-03 13:30:54 -07:00
Anirudh Dewani
3be5cb6382
am 766b7f57: am 5ef1389e: packaging the sample for SDK
...
* commit '766b7f578d26c7e528e7d1b21a0a56707a6adf8e':
packaging the sample for SDK
2012-07-03 13:16:21 -07:00
Anirudh Dewani
766b7f578d
am 5ef1389e: packaging the sample for SDK
...
* commit '5ef1389ebb89c25836c0cc7a1dfc1ef8ad3209a3':
packaging the sample for SDK
2012-07-03 13:13:57 -07:00
The Android Automerger
d29d91e89b
merge in jb-release history after reset to jb-dev
2012-07-03 12:51:31 -07:00
Anirudh Dewani
5ef1389ebb
packaging the sample for SDK
...
Change-Id: Ie398d7dfd421d7ec3de7ce58a9b9dedd532cd2db
2012-07-03 12:48:49 -07:00
Anirudh Dewani
a132f2f179
am 8ab50ab5: am 89c08bb5: Merge "WiFi Direct Service Discovery sample" into jb-dev
...
* commit '8ab50ab5a6413ba245d0d9e907fd1a01ef5a3138':
WiFi Direct Service Discovery sample
2012-07-03 12:35:19 -07:00
Anirudh Dewani
8ab50ab5a6
am 89c08bb5: Merge "WiFi Direct Service Discovery sample" into jb-dev
...
* commit '89c08bb50f6dbb57fb0ad7881f1b0556c38a2b5f':
WiFi Direct Service Discovery sample
2012-07-03 12:32:24 -07:00
Anirudh Dewani
89c08bb50f
Merge "WiFi Direct Service Discovery sample" into jb-dev
2012-07-03 12:29:41 -07:00
The Android Open Source Project
d01f6efb68
am 31b52351: Reconcile with jb-release
...
* commit '31b5235147b986d4c6e18e96309581c74c634c27':
2012-07-03 12:14:21 -07:00
The Android Open Source Project
31b5235147
Reconcile with jb-release
...
Change-Id: Ic12bd9ea68dde200b868659ed6134332fda8f244
2012-07-03 12:11:43 -07:00
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
