Anton Cherkashyn
35000f0a78
Fix Eclipse .classpath file for JB.
...
Fix eclipse include path. "filterfw_intermediates/classes-jarjar.jar"
library is no longer used.
Signed-off by: Anton Cherkashyn <mail@antonc.com >
Change-Id: I29cd7b93c0fcd6c0986889b7d3b5562dca04881c
2012-07-19 09:14:52 -07:00
The Android Open Source Project
781f3663a1
am aafb4609: Reconcile with jb-mr0-release jb-release
...
* commit 'aafb46093d1f453ba6f299a1910728f25037b068':
Move SDK system image package to rev 2.
2012-07-19 08:52:04 -07:00
The Android Open Source Project
aafb46093d
Reconcile with jb-mr0-release jb-release
...
Change-Id: I10c1743cce5380ca689dee0dad605ec2b3b43799
2012-07-19 08:36:18 -07:00
The Android Automerger
fd3470f9a3
merge in jb-release history after reset to jb-dev
2012-07-18 23:04:37 -07:00
Fabrice Di Meglio
161859ee84
Update ApiDemos for ActionBar
...
- use Gravity.START and Gravity.END
Change-Id: Id2adac4c23ad2de2d04a36ef8195367aea63c66f
2012-07-18 15:00:22 -07:00
Winson Chung
c2a22376da
Updating WeatherListWidget to use new resize callbacks. (Bug 6441164)
...
Change-Id: Ifc2730c564532147e5f60022955a7e97d3e1d855
2012-07-18 11:52:03 -07:00
Wink Saville
07d4bafc5d
Merge "Add opt/telephony and opt/mms to eclipse .classpath"
2012-07-17 16:06:10 -07:00
Wink Saville
d7269a0191
Add opt/telephony and opt/mms to eclipse .classpath
...
Change-Id: I7ac5ff06f72435dbe10463ca71413df1fde9e676
2012-07-17 15:20:47 -07:00
Wink Saville
58688e7ffd
am 4e0dd447: (-s ours) am 0275bc68: (-s ours) Use telephony-common and mms-common. - DO NOT MERGE
...
* commit '4e0dd447a6d0ec43c8f9ac79893da09dcb76a0cc':
Use telephony-common and mms-common. - DO NOT MERGE
2012-07-17 14:08:46 -07:00
Wink Saville
4e0dd447a6
am 0275bc68: (-s ours) Use telephony-common and mms-common. - DO NOT MERGE
...
* commit '0275bc68eae54a882bb27e534ca401fad3acc663':
Use telephony-common and mms-common. - DO NOT MERGE
2012-07-17 12:33:23 -07:00
The Android Automerger
0ce32aeb2e
merge in jb-mr0-release history after reset to jb-dev
2012-07-17 12:29:38 -07:00
Wink Saville
0275bc68ea
Use telephony-common and mms-common. - DO NOT MERGE
...
Change-Id: If2e6b49eb9ceafc43de107ce761163c654f3ee35
2012-07-17 12:23:03 -07:00
Stephen Hines
5709a0a3eb
Merge "Build RSHelloCompute for API 14."
2012-07-16 15:40:41 -07:00
Eino-Ville Talvala
bd1c139a5c
Merge "gralloc: Support HAL_PIXEL_FORMAT_YCrCb_420_SP (NV21)"
2012-07-16 14:26:44 -07:00
Stephen Hines
ab2fe6d4d2
Build RSHelloCompute for API 14.
...
Change-Id: I582434aa026b3a7ba3eb35d68faba2995808d062
2012-07-16 11:47:39 -07:00
Xavier Ducrohet
f0aa9b50db
am 2fb22b2c: am c8b44d4c: Update SDK platform-tools revision to 13.
...
* commit '2fb22b2c8b683f44f3bdc219d3a4fcaffd58338a':
Update SDK platform-tools revision to 13.
2012-07-16 11:17:04 -07:00
Xavier Ducrohet
2fb22b2c8b
am c8b44d4c: Update SDK platform-tools revision to 13.
...
* commit 'c8b44d4ceeb110b5c836e7a3ee5a1f1ed905d975':
Update SDK platform-tools revision to 13.
2012-07-16 11:14:13 -07:00
Xavier Ducrohet
c8b44d4cee
Update SDK platform-tools revision to 13.
...
Change-Id: I0eefe31df11e31892f3574c1f8c05025b766b4e1
2012-07-13 16:21:28 -07:00
Colin Cross
c52fe389d5
Add libsparse to sdk whitelist
...
Add libsparse to the sdk whitelist so fastboot can link against it on
windows.
Change-Id: I9c78d99842cb48f970669b1e7421cb5f98e47555
2012-07-13 14:26:34 -07:00
Ying Wang
93f9a6216e
Import translations. DO NOT MERGE
...
Change-Id: I66840cd38054f08e128946987da15fd00271c130
Auto-generated-cl: translation import
2012-07-13 12:57:47 -07:00
Xavier Ducrohet
2507de80fa
Move SDK system image package to rev 2.
...
Change-Id: I58be9742ccca65e72de381e07ac31e11f729a404
2012-07-12 17:25:56 -07:00
Dianne Hackborn
20f37b7e8d
Merge "New development tool for creating cache files."
2012-07-12 16:37:15 -07:00
Xavier Ducrohet
c4178be8ad
am d3efe8aa: am 51ea9221: Move SDK system image package to rev 2.
...
* commit 'd3efe8aa3288c7b9c5dcde13fac1dbed6fae935d':
Move SDK system image package to rev 2.
2012-07-12 16:18:48 -07:00
Xavier Ducrohet
d3efe8aa32
am 51ea9221: Move SDK system image package to rev 2.
...
* commit '51ea9221e62b147939b14ab9fe1852c3f67bec90':
Move SDK system image package to rev 2.
2012-07-12 16:17:06 -07:00
Xavier Ducrohet
51ea9221e6
Move SDK system image package to rev 2.
...
Change-Id: I58be9742ccca65e72de381e07ac31e11f729a404
2012-07-12 16:14:46 -07:00
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