Nick Pelly
|
566bd9a4d0
|
am 19326cdc: (-s ours) am d64d711d: Merge "Change Tag.getTechnology(NfcAdapter, int) to NfcAdapter.getTechnology(Tag, int)" into gingerbread
* commit '19326cdcbf551728c54a844ddebe03b0f5d8d268':
Change Tag.getTechnology(NfcAdapter, int) to NfcAdapter.getTechnology(Tag, int)
|
2011-01-12 15:30:41 -08:00 |
|
Jason Sams
|
2043cf4edb
|
am ef56ee31: Merge "WAR driver bug where surfaces of size 0 fail." into honeycomb
* commit 'ef56ee316cc361cd6519810ae3ae1051ed6fc79b':
WAR driver bug where surfaces of size 0 fail.
|
2011-01-12 15:30:18 -08:00 |
|
Huahui Wu
|
3af420fb61
|
am 55873051: Merge "b/3344966 pan following the focus point instead the first point." into honeycomb
* commit '558730510963ad80d7a539351b3f1cb16e3040c2':
b/3344966 pan following the focus point instead the first point.
|
2011-01-12 15:30:14 -08:00 |
|
Jason Sams
|
64cdcdc2bf
|
Merge "WAR driver bug where surfaces of size 0 fail." into honeycomb
|
2011-01-12 15:28:19 -08:00 |
|
Huahui Wu
|
1f8c1433fd
|
Merge "b/3344966 pan following the focus point instead the first point." into honeycomb
|
2011-01-12 15:27:16 -08:00 |
|
Jason Sams
|
aed09e5096
|
am 208a1c68: Merge "Implement more of copy2DRange*" into honeycomb
* commit '208a1c68ee21930112a3704bf8c46a9f27d8d04d':
Implement more of copy2DRange*
|
2011-01-12 15:24:08 -08:00 |
|
Jason Sams
|
0a4079024e
|
Merge "Implement more of copy2DRange*" into honeycomb
|
2011-01-12 15:22:09 -08:00 |
|
Justin Ho
|
dbb87df5f7
|
am 63be8dd1: Merge "Updated notification sounds for trygon" into honeycomb
* commit '63be8dd178447fce289c940638cd37aa560d9de3':
Updated notification sounds for trygon
|
2011-01-12 15:08:24 -08:00 |
|
Romain Guy
|
90e7b48179
|
am b08ea03c: Merge "Reenable region composition pipeline for layers Bug #3341848" into honeycomb
* commit 'b08ea03c1bbb8bfa2c44d23c50155e3f34a6968c':
Reenable region composition pipeline for layers Bug #3341848
|
2011-01-12 15:08:17 -08:00 |
|
Kenny Root
|
6ba9878cc0
|
am e8c04db7: Merge "Add the {get,set}PackageObbPaths calls to API" into gingerbread
* commit 'e8c04db71e347396e9537ead7113ba9f46706e44':
Add the {get,set}PackageObbPaths calls to API
|
2011-01-12 15:06:51 -08:00 |
|
Justin Ho
|
4d3df43e6d
|
Merge "Updated notification sounds for trygon" into honeycomb
|
2011-01-12 15:06:19 -08:00 |
|
Romain Guy
|
ae2231040d
|
Merge "Reenable region composition pipeline for layers Bug #3341848" into honeycomb
|
2011-01-12 15:06:18 -08:00 |
|
Kenny Root
|
9c9f15acb5
|
Merge "Add the {get,set}PackageObbPaths calls to API" into gingerbread
|
2011-01-12 15:03:43 -08:00 |
|
Xia Wang
|
ee388225bb
|
am 1aaae92f: Merge "Wait for Wi-Fi state change before set the state verification criteria. bug: 3336896" into honeycomb
* commit '1aaae92f990bad51d503fe692def01191fda4db7':
Wait for Wi-Fi state change before set the state verification criteria. bug: 3336896
|
2011-01-12 15:03:41 -08:00 |
|
Jamie Gennis
|
656dbcae7b
|
am 103198a1: Merge "Implement crop & transform for SurfaceTexture." into honeycomb
* commit '103198a10cc22a49270a787d04b8ab484d2ec235':
Implement crop & transform for SurfaceTexture.
|
2011-01-12 15:03:37 -08:00 |
|
Carl Shapiro
|
33856cf0f0
|
am d688e5af: Merge "Remove minimum heap size test now that the underlying interface is gone." into honeycomb
* commit 'd688e5af1c95a8b5a482c146cd789c2be45f9663':
Remove minimum heap size test now that the underlying interface is gone.
|
2011-01-12 15:03:34 -08:00 |
|
Marco Nelissen
|
3a71f107e0
|
am a8a656b0: Fix scanning of modified files.
* commit 'a8a656b0c595fa876a387a91f8813f88a2d3abe7':
Fix scanning of modified files.
|
2011-01-12 15:03:28 -08:00 |
|
Kenny Root
|
b516ae7e56
|
am e7b2310a: Merge "Make sure AppCacheTest casts to long" into honeycomb
* commit 'e7b2310a856889aa1e683104039033ada3f6b696':
Make sure AppCacheTest casts to long
|
2011-01-12 15:03:24 -08:00 |
|
Brad Fitzpatrick
|
8d56d13571
|
am 2e390809: Merge "Unhide Content{Resolver,Provider}.call()" into honeycomb
* commit '2e3908097b1c86004d50c0a070ca6b76a4d0d7c5':
Unhide Content{Resolver,Provider}.call()
|
2011-01-12 15:03:15 -08:00 |
|
Stephen Hines
|
5b1ae6d2e1
|
am a9b1b2a7: Merge "Unhide more of the RS APIs." into honeycomb
* commit 'a9b1b2a703b45632d6fb63271e0c00316faa5ec7':
Unhide more of the RS APIs.
|
2011-01-12 15:03:07 -08:00 |
|
Xia Wang
|
ac6b50a8db
|
Merge "Wait for Wi-Fi state change before set the state verification criteria. bug: 3336896" into honeycomb
|
2011-01-12 14:58:46 -08:00 |
|
Jamie Gennis
|
2d605c4208
|
Merge "Implement crop & transform for SurfaceTexture." into honeycomb
|
2011-01-12 14:57:29 -08:00 |
|
Carl Shapiro
|
23b5a89a0f
|
Merge "Remove minimum heap size test now that the underlying interface is gone." into honeycomb
|
2011-01-12 14:51:54 -08:00 |
|
Kenny Root
|
7d9b00786e
|
Merge "Make sure AppCacheTest casts to long" into honeycomb
|
2011-01-12 14:40:57 -08:00 |
|
Brad Fitzpatrick
|
d86e104d99
|
Merge "Unhide Content{Resolver,Provider}.call()" into honeycomb
|
2011-01-12 14:39:50 -08:00 |
|
Stephen Hines
|
8a5419821d
|
Merge "Unhide more of the RS APIs." into honeycomb
|
2011-01-12 14:39:11 -08:00 |
|
Andreas Huber
|
9aa4c6e591
|
am 7928ca6f: Merge "Fail to parse duration instead of asserting, if the server response cannot be parsed." into honeycomb
* commit '7928ca6f87af4b70086ecf75383ba43da37da891':
Fail to parse duration instead of asserting, if the server response cannot be parsed.
|
2011-01-12 14:35:46 -08:00 |
|
James Dong
|
e09d0211fb
|
am 068b41d5: Merge "Publish MediaMetadataRetriever.java as public API" into honeycomb
* commit '068b41d5d41a4a78c96586b85ea89d464d302548':
Publish MediaMetadataRetriever.java as public API
|
2011-01-12 14:35:35 -08:00 |
|
Andreas Huber
|
7119976dbc
|
Merge "Fail to parse duration instead of asserting, if the server response cannot be parsed." into honeycomb
|
2011-01-12 14:33:51 -08:00 |
|
Dianne Hackborn
|
235d6e36e8
|
am a353581c: Merge "Fix issue #3344089: runtime restart due to java.lang.StackOverflowError..." into honeycomb
* commit 'a353581c65dba1ca5a27f33a05a0077ffdabf72a':
Fix issue #3344089: runtime restart due to java.lang.StackOverflowError...
|
2011-01-12 14:33:15 -08:00 |
|
Romain Guy
|
510075b5a4
|
am 2e0c5261: Merge "Add logging to the new layers API." into honeycomb
* commit '2e0c52610bd5787d716840c71c54ee23ac3fcdd4':
Add logging to the new layers API.
|
2011-01-12 14:33:10 -08:00 |
|
James Dong
|
9ceca322e1
|
Merge "Publish MediaMetadataRetriever.java as public API" into honeycomb
|
2011-01-12 14:31:34 -08:00 |
|
Mike Lockwood
|
bb74845f3d
|
am 0dd9f4de: MediaScanner: Do not update the file path when updating records already in the database
* commit '0dd9f4de3ed681e83bd79ddcd4fd463093d11ed3':
MediaScanner: Do not update the file path when updating records already in the database
|
2011-01-12 14:30:53 -08:00 |
|
Dianne Hackborn
|
adbbdb3d97
|
Merge "Fix issue #3344089: runtime restart due to java.lang.StackOverflowError..." into honeycomb
|
2011-01-12 14:29:34 -08:00 |
|
Romain Guy
|
7bc4e56165
|
Merge "Add logging to the new layers API." into honeycomb
|
2011-01-12 14:29:15 -08:00 |
|
Mike Lockwood
|
1498b2d6e7
|
am a2946433: Merge "Media Provider and MTP now use emulated /mnt/sdcard instead of /data/media" into honeycomb
* commit 'a29464335a1d164fde0817715d86ba6224d0a61f':
Media Provider and MTP now use emulated /mnt/sdcard instead of /data/media
|
2011-01-12 14:28:37 -08:00 |
|
Mike Lockwood
|
d97ba712a5
|
am c13db225: Merge "Remove permission android.permission.WRITE_MEDIA_STORAGE" into honeycomb
* commit 'c13db22581aebe0ad16a833e778eedf947eccd1f':
Remove permission android.permission.WRITE_MEDIA_STORAGE
|
2011-01-12 14:28:33 -08:00 |
|
Mike Lockwood
|
337119b3b7
|
Merge "Media Provider and MTP now use emulated /mnt/sdcard instead of /data/media" into honeycomb
|
2011-01-12 14:25:13 -08:00 |
|
Mike Lockwood
|
43ffd1a873
|
Merge "Remove permission android.permission.WRITE_MEDIA_STORAGE" into honeycomb
|
2011-01-12 14:25:05 -08:00 |
|
Romain Guy
|
b0c63e354f
|
am e465b117: Merge "Better debug info for layers." into honeycomb
* commit 'e465b11745cdc49283c360fb2acf01649f4f4fb0':
Better debug info for layers.
|
2011-01-12 14:17:59 -08:00 |
|
Romain Guy
|
0fc508addf
|
Merge "Better debug info for layers." into honeycomb
|
2011-01-12 14:15:59 -08:00 |
|
Gilles Debunne
|
961cef3d0f
|
am 54c38bf0: Merge "New QuickContactBadge holo style." into honeycomb
* commit '54c38bf05da42e40b8726ab2b5a33762081e9345':
New QuickContactBadge holo style.
|
2011-01-12 14:09:42 -08:00 |
|
Gilles Debunne
|
65c76aafb9
|
Merge "New QuickContactBadge holo style." into honeycomb
|
2011-01-12 14:07:26 -08:00 |
|
Jaikumar Ganesh
|
bb5239e0f8
|
am c8f42fb6: Merge "DO NOT MERGE: Remove auto connection on ACL connection." into gingerbread
* commit 'c8f42fb69867f171c04013b1b1a8f7e897ae3685':
DO NOT MERGE: Remove auto connection on ACL connection.
|
2011-01-12 13:58:17 -08:00 |
|
Jaikumar Ganesh
|
d4960f4492
|
Merge "DO NOT MERGE: Remove auto connection on ACL connection." into gingerbread
|
2011-01-12 13:56:13 -08:00 |
|
Eric Laurent
|
2ad398bba5
|
am bec4abaa: Merge "Fix issue 3302649." into gingerbread
* commit 'bec4abaa12bf6759f354b54119c5524cf9339e7b':
Fix issue 3302649.
|
2011-01-12 13:52:42 -08:00 |
|
Eric Laurent
|
9e41414cd5
|
Merge "Fix issue 3302649." into gingerbread
|
2011-01-12 13:50:51 -08:00 |
|
Justin Ho
|
65c8b1a5b2
|
am 7b667a0c: Merge "Updated flightmode assets" into gingerbread
* commit '7b667a0c4b017af3c6b9e1f8a6dae56e2c53e07f':
Updated flightmode assets
|
2011-01-12 13:50:25 -08:00 |
|
Justin Ho
|
a7498c90b9
|
Merge "Updated flightmode assets" into gingerbread
|
2011-01-12 13:47:59 -08:00 |
|
Jason Sams
|
e5dae8ed72
|
am 8f597fdf: Merge "Cleanup bitmap uploads Implement standalone mipmap generation." into honeycomb
* commit '8f597fdfacd1b9cda6dfebf4f3a1c34d1ffb5b2f':
Cleanup bitmap uploads Implement standalone mipmap generation.
|
2011-01-12 13:33:22 -08:00 |
|