OSDN Git Service
Justin Ho [Thu, 13 Jan 2011 06:59:33 +0000 (22:59 -0800)]
am
cd0331ab: Fixing broken dropdown asset in Honeycomb as well
* commit '
cd0331abd7eb1e9efff3251caa008492fe5cad35':
Fixing broken dropdown asset in Honeycomb as well
Andy Stadler [Thu, 13 Jan 2011 05:17:03 +0000 (21:17 -0800)]
am
7b0f8f08: API changes to support encryption in DPM
* commit '
7b0f8f08ac7b3ed5cf462b92283713b033d6a64a':
API changes to support encryption in DPM
Jaikumar Ganesh [Thu, 13 Jan 2011 04:48:51 +0000 (20:48 -0800)]
am
471de1f5: (-s ours) am
c8f42fb6: Merge "DO NOT MERGE: Remove auto connection on ACL connection." into gingerbread
* commit '
471de1f5b3cc629739d8315ff195d6af928e7ae4':
DO NOT MERGE: Remove auto connection on ACL connection.
Eric Laurent [Thu, 13 Jan 2011 04:48:44 +0000 (20:48 -0800)]
am
48f400c3: am
bec4abaa: Merge "Fix issue
3302649." into gingerbread
* commit '
48f400c3762bd50603222cb5e7856d6aef4ebc4e':
Fix issue
3302649.
Justin Ho [Thu, 13 Jan 2011 04:48:38 +0000 (20:48 -0800)]
am
58ea9394: (-s ours) am
7b667a0c: Merge "Updated flightmode assets" into gingerbread
* commit '
58ea93945b6cd7b91d2d54845275fd90ee7fb291':
Updated flightmode assets
Chet Haase [Thu, 13 Jan 2011 04:36:59 +0000 (20:36 -0800)]
am
7cc5e1d5: Merge "Fix null crash when fragments go away during animations" into honeycomb
* commit '
7cc5e1d5488c9e0a3f898a62b626ffb3ae074440':
Fix null crash when fragments go away during animations
Chet Haase [Thu, 13 Jan 2011 04:34:32 +0000 (20:34 -0800)]
Merge "Fix null crash when fragments go away during animations" into honeycomb
Christopher Tate [Thu, 13 Jan 2011 04:25:32 +0000 (20:25 -0800)]
am
44a94bb5: Merge "Turn off debugging logspam for release" into honeycomb
* commit '
44a94bb5a915922400944f666b218f4bb268c565':
Turn off debugging logspam for release
Christopher Tate [Thu, 13 Jan 2011 04:23:49 +0000 (20:23 -0800)]
Merge "Turn off debugging logspam for release" into honeycomb
Jim Miller [Thu, 13 Jan 2011 04:10:28 +0000 (20:10 -0800)]
am
66707eee: Merge "Fix
3253629: Tweaks to recent apps" into honeycomb
* commit '
66707eee84ee874f60ff5d25c5d2d00769e79616':
Fix
3253629: Tweaks to recent apps
Jim Miller [Thu, 13 Jan 2011 04:07:36 +0000 (20:07 -0800)]
Merge "Fix
3253629: Tweaks to recent apps" into honeycomb
Kenny Root [Thu, 13 Jan 2011 03:01:48 +0000 (19:01 -0800)]
am
0ee29447: am
6688b6c3: Merge "Allow updated system apps to retain priority" into gingerbread
* commit '
0ee294470d09e1de0ce0fe6e3246e98e450a4d26':
Allow updated system apps to retain priority
Andreas Huber [Thu, 13 Jan 2011 03:01:37 +0000 (19:01 -0800)]
am
c88b2c44: am
7c615360: Fail to parse duration instead of asserting, if the server response cannot be parsed.
* commit '
c88b2c44117e7e3ff3deb786f7d984f4096a63de':
Fail to parse duration instead of asserting, if the server response cannot be parsed.
Andreas Huber [Thu, 13 Jan 2011 03:01:17 +0000 (19:01 -0800)]
am
0ef0d76a: (-s ours) am
7e2f9cc8: DO NOT MERGE: Fix Matroska issues
* commit '
0ef0d76a9d5477942d5586933d35d299671fadc5':
DO NOT MERGE: Fix Matroska issues
Chet Haase [Thu, 13 Jan 2011 02:35:14 +0000 (18:35 -0800)]
am
ef9932c2: Merge "Supress layout requests while a LayoutTransition is running." into honeycomb
* commit '
ef9932c2505eaf5a4256c6c398aa640bee3b47ea':
Supress layout requests while a LayoutTransition is running.
Chet Haase [Thu, 13 Jan 2011 02:33:05 +0000 (18:33 -0800)]
Merge "Supress layout requests while a LayoutTransition is running." into honeycomb
Xavier Ducrohet [Thu, 13 Jan 2011 02:24:52 +0000 (18:24 -0800)]
am
cb27d4b2: Merge "LayoutLib: use tags in logs." into honeycomb
* commit '
cb27d4b2f530033c90432745115b914d8f26c3e7':
LayoutLib: use tags in logs.
Xavier Ducrohet [Thu, 13 Jan 2011 02:23:04 +0000 (18:23 -0800)]
Merge "LayoutLib: use tags in logs." into honeycomb
repo sync [Thu, 13 Jan 2011 01:58:48 +0000 (17:58 -0800)]
am
d439ac39: resolved conflicts for merge of
e7fbfb6b to gingerbread-plus-aosp
* commit '
d439ac396ecb9e909c543424211d563325fea72b':
DO NOT MERGE: Fix parsing of ntp= PLAY response.
Kenny Root [Thu, 13 Jan 2011 01:58:25 +0000 (17:58 -0800)]
am
4aab4bc2: am
91c459ec: Copy user info from PackageSetting as well
* commit '
4aab4bc2a3b97e25573e8484d5f5aa8deb812d48':
Copy user info from PackageSetting as well
Chung-yih Wang [Thu, 13 Jan 2011 01:58:08 +0000 (17:58 -0800)]
am
eb74d1aa: am
65ba2c42: Merge "Add auth. username in SipProfile." into gingerbread
* commit '
eb74d1aab5f67ae3a4123fbab9a419595fab081c':
Add auth. username in SipProfile.
Nick Pelly [Thu, 13 Jan 2011 01:57:30 +0000 (17:57 -0800)]
am
a058f565: (-s ours) am
ca36d863: Update API current.xml to unbreak build.
* commit '
a058f565663253077c3118d9aad00e03dcd45684':
Update API current.xml to unbreak build.
Carl Shapiro [Thu, 13 Jan 2011 01:23:37 +0000 (17:23 -0800)]
am
e9739d09: Merge "Note the release in which functionality was deprecated." into honeycomb
* commit '
e9739d09cb53fd05cc9229049b3d54c7f6816450':
Note the release in which functionality was deprecated.
Carl Shapiro [Thu, 13 Jan 2011 01:21:46 +0000 (17:21 -0800)]
Merge "Note the release in which functionality was deprecated." into honeycomb
Elliott Hughes [Thu, 13 Jan 2011 01:16:17 +0000 (17:16 -0800)]
am
f7bb4044: Merge "Fix build." into honeycomb
* commit '
f7bb4044e3e11845fd0980ad2393236add5b32ac':
Fix build.
Elliott Hughes [Thu, 13 Jan 2011 01:14:43 +0000 (17:14 -0800)]
Merge "Fix build." into honeycomb
Joe Onorato [Thu, 13 Jan 2011 01:09:06 +0000 (17:09 -0800)]
am
f4699efb: Merge "Possibly fix bad notification updates." into honeycomb
* commit '
f4699efb635dc7695e346343e9b9024ed225a612':
Possibly fix bad notification updates.
Joe Onorato [Thu, 13 Jan 2011 01:07:11 +0000 (17:07 -0800)]
Merge "Possibly fix bad notification updates." into honeycomb
Carl Shapiro [Thu, 13 Jan 2011 01:04:38 +0000 (17:04 -0800)]
am
0123afbb: Merge "Deprecate the allocation limit interfaces." into honeycomb
* commit '
0123afbb228c2849f481b5219ce82c070562b04a':
Deprecate the allocation limit interfaces.
Carl Shapiro [Thu, 13 Jan 2011 01:02:18 +0000 (17:02 -0800)]
Merge "Deprecate the allocation limit interfaces." into honeycomb
James Dong [Thu, 13 Jan 2011 00:41:36 +0000 (16:41 -0800)]
am
14bdce04: Merge "Remove legacy code that should not be used" into honeycomb
* commit '
14bdce0441378b766afca3eaa5ac78dbc2f7c6e1':
Remove legacy code that should not be used
James Dong [Thu, 13 Jan 2011 00:39:43 +0000 (16:39 -0800)]
Merge "Remove legacy code that should not be used" into honeycomb
Romain Guy [Thu, 13 Jan 2011 00:24:27 +0000 (16:24 -0800)]
am
d6b13534: Merge "Only enable GL rendering on the main thread." into honeycomb
* commit '
d6b13534d44faee5bf80eb02495c17aa0195d381':
Only enable GL rendering on the main thread.
Romain Guy [Thu, 13 Jan 2011 00:22:48 +0000 (16:22 -0800)]
Merge "Only enable GL rendering on the main thread." into honeycomb
Amith Yamasani [Thu, 13 Jan 2011 00:00:59 +0000 (16:00 -0800)]
am
e1c99a1f: Merge "Remove popup indicator for dialog style preference items." into honeycomb
* commit '
e1c99a1f5bb86066d2e9ea48b27cf60d1b78544b':
Remove popup indicator for dialog style preference items.
Amith Yamasani [Wed, 12 Jan 2011 23:59:02 +0000 (15:59 -0800)]
Merge "Remove popup indicator for dialog style preference items." into honeycomb
Joe Onorato [Wed, 12 Jan 2011 23:48:45 +0000 (15:48 -0800)]
am
895eee7b: Merge "Remove the volume slider in SystemUI." into honeycomb
* commit '
895eee7bac7dad66b51406d23529bec1dc9ad901':
Remove the volume slider in SystemUI.
Joe Onorato [Wed, 12 Jan 2011 23:47:08 +0000 (15:47 -0800)]
Merge "Remove the volume slider in SystemUI." into honeycomb
Gilles Debunne [Wed, 12 Jan 2011 23:42:43 +0000 (15:42 -0800)]
am
95a95717: New menu_dropdown_panel assets.
* commit '
95a9571702e64857e7d8d7dc6c8a46caec874a6b':
New menu_dropdown_panel assets.
Martijn Coenen [Wed, 12 Jan 2011 23:31:07 +0000 (15:31 -0800)]
am
261fa998: am
25be5365: Implement canMakeReadonly().
* commit '
261fa99890ebd1ea15a6067859b0e931a3009859':
Implement canMakeReadonly().
James Dong [Wed, 12 Jan 2011 23:31:01 +0000 (15:31 -0800)]
am
0569e589: (-s ours) am
13d1cb56: Merge "Avoid deadlock in OMX::freeNode by making sure OMXCodecObserver does not hold the last reference of OMXCodec object - do not merge" into gingerbread
* commit '
0569e58988bae5f08733e21e8d8adfa61fe89b7f':
Avoid deadlock in OMX::freeNode by making sure OMXCodecObserver does not hold the last reference of OMXCodec object - do not merge
Nick Pelly [Wed, 12 Jan 2011 23:30:53 +0000 (15:30 -0800)]
am
6b9db1d8: am
92939376: Merge "Remove attemptDeadServiceRecovery() from TagTechnology\'s." into gingerbread
* commit '
6b9db1d8c808439abc12d572283b7fab50fb5257':
Remove attemptDeadServiceRecovery() from TagTechnology's.
Nick Pelly [Wed, 12 Jan 2011 23:30:41 +0000 (15:30 -0800)]
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)
Jason Sams [Wed, 12 Jan 2011 23:30:18 +0000 (15:30 -0800)]
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.
Huahui Wu [Wed, 12 Jan 2011 23:30:14 +0000 (15:30 -0800)]
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.
Jason Sams [Wed, 12 Jan 2011 23:28:19 +0000 (15:28 -0800)]
Merge "WAR driver bug where surfaces of size 0 fail." into honeycomb
Huahui Wu [Wed, 12 Jan 2011 23:27:16 +0000 (15:27 -0800)]
Merge "b/
3344966 pan following the focus point instead the first point." into honeycomb
Jason Sams [Wed, 12 Jan 2011 23:24:08 +0000 (15:24 -0800)]
am
208a1c68: Merge "Implement more of copy2DRange*" into honeycomb
* commit '
208a1c68ee21930112a3704bf8c46a9f27d8d04d':
Implement more of copy2DRange*
Jason Sams [Wed, 12 Jan 2011 23:22:09 +0000 (15:22 -0800)]
Merge "Implement more of copy2DRange*" into honeycomb
Justin Ho [Wed, 12 Jan 2011 23:08:24 +0000 (15:08 -0800)]
am
63be8dd1: Merge "Updated notification sounds for trygon" into honeycomb
* commit '
63be8dd178447fce289c940638cd37aa560d9de3':
Updated notification sounds for trygon
Romain Guy [Wed, 12 Jan 2011 23:08:17 +0000 (15:08 -0800)]
am
b08ea03c: Merge "Reenable region composition pipeline for layers Bug #
3341848" into honeycomb
* commit '
b08ea03c1bbb8bfa2c44d23c50155e3f34a6968c':
Reenable region composition pipeline for layers Bug #
3341848
Justin Ho [Wed, 12 Jan 2011 23:06:18 +0000 (15:06 -0800)]
Merge "Updated notification sounds for trygon" into honeycomb
Romain Guy [Wed, 12 Jan 2011 23:06:18 +0000 (15:06 -0800)]
Merge "Reenable region composition pipeline for layers Bug #
3341848" into honeycomb
Xia Wang [Wed, 12 Jan 2011 23:03:41 +0000 (15:03 -0800)]
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
Jamie Gennis [Wed, 12 Jan 2011 23:03:37 +0000 (15:03 -0800)]
am
103198a1: Merge "Implement crop & transform for SurfaceTexture." into honeycomb
* commit '
103198a10cc22a49270a787d04b8ab484d2ec235':
Implement crop & transform for SurfaceTexture.
Carl Shapiro [Wed, 12 Jan 2011 23:03:34 +0000 (15:03 -0800)]
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.
Marco Nelissen [Wed, 12 Jan 2011 23:03:28 +0000 (15:03 -0800)]
am
a8a656b0: Fix scanning of modified files.
* commit '
a8a656b0c595fa876a387a91f8813f88a2d3abe7':
Fix scanning of modified files.
Kenny Root [Wed, 12 Jan 2011 23:03:24 +0000 (15:03 -0800)]
am
e7b2310a: Merge "Make sure AppCacheTest casts to long" into honeycomb
* commit '
e7b2310a856889aa1e683104039033ada3f6b696':
Make sure AppCacheTest casts to long
Brad Fitzpatrick [Wed, 12 Jan 2011 23:03:15 +0000 (15:03 -0800)]
am
2e390809: Merge "Unhide Content{Resolver,Provider}.call()" into honeycomb
* commit '
2e3908097b1c86004d50c0a070ca6b76a4d0d7c5':
Unhide Content{Resolver,Provider}.call()
Stephen Hines [Wed, 12 Jan 2011 23:03:07 +0000 (15:03 -0800)]
am
a9b1b2a7: Merge "Unhide more of the RS APIs." into honeycomb
* commit '
a9b1b2a703b45632d6fb63271e0c00316faa5ec7':
Unhide more of the RS APIs.
Xia Wang [Wed, 12 Jan 2011 22:58:46 +0000 (14:58 -0800)]
Merge "Wait for Wi-Fi state change before set the state verification criteria. bug:
3336896" into honeycomb
Jamie Gennis [Wed, 12 Jan 2011 22:57:29 +0000 (14:57 -0800)]
Merge "Implement crop & transform for SurfaceTexture." into honeycomb
Carl Shapiro [Wed, 12 Jan 2011 22:51:54 +0000 (14:51 -0800)]
Merge "Remove minimum heap size test now that the underlying interface is gone." into honeycomb
Kenny Root [Wed, 12 Jan 2011 22:40:57 +0000 (14:40 -0800)]
Merge "Make sure AppCacheTest casts to long" into honeycomb
Brad Fitzpatrick [Wed, 12 Jan 2011 22:39:50 +0000 (14:39 -0800)]
Merge "Unhide Content{Resolver,Provider}.call()" into honeycomb
Stephen Hines [Wed, 12 Jan 2011 22:39:11 +0000 (14:39 -0800)]
Merge "Unhide more of the RS APIs." into honeycomb
Andreas Huber [Wed, 12 Jan 2011 22:35:46 +0000 (14:35 -0800)]
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.
James Dong [Wed, 12 Jan 2011 22:35:35 +0000 (14:35 -0800)]
am
068b41d5: Merge "Publish MediaMetadataRetriever.java as public API" into honeycomb
* commit '
068b41d5d41a4a78c96586b85ea89d464d302548':
Publish MediaMetadataRetriever.java as public API
Andreas Huber [Wed, 12 Jan 2011 22:33:51 +0000 (14:33 -0800)]
Merge "Fail to parse duration instead of asserting, if the server response cannot be parsed." into honeycomb
Dianne Hackborn [Wed, 12 Jan 2011 22:33:15 +0000 (14:33 -0800)]
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...
Romain Guy [Wed, 12 Jan 2011 22:33:10 +0000 (14:33 -0800)]
am
2e0c5261: Merge "Add logging to the new layers API." into honeycomb
* commit '
2e0c52610bd5787d716840c71c54ee23ac3fcdd4':
Add logging to the new layers API.
James Dong [Wed, 12 Jan 2011 22:31:34 +0000 (14:31 -0800)]
Merge "Publish MediaMetadataRetriever.java as public API" into honeycomb
Mike Lockwood [Wed, 12 Jan 2011 22:30:53 +0000 (14:30 -0800)]
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
Dianne Hackborn [Wed, 12 Jan 2011 22:29:34 +0000 (14:29 -0800)]
Merge "Fix issue #
3344089: runtime restart due to java.lang.StackOverflowError..." into honeycomb
Romain Guy [Wed, 12 Jan 2011 22:29:15 +0000 (14:29 -0800)]
Merge "Add logging to the new layers API." into honeycomb
Mike Lockwood [Wed, 12 Jan 2011 22:28:37 +0000 (14:28 -0800)]
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
Mike Lockwood [Wed, 12 Jan 2011 22:28:33 +0000 (14:28 -0800)]
am
c13db225: Merge "Remove permission android.permission.WRITE_MEDIA_STORAGE" into honeycomb
* commit '
c13db22581aebe0ad16a833e778eedf947eccd1f':
Remove permission android.permission.WRITE_MEDIA_STORAGE
Mike Lockwood [Wed, 12 Jan 2011 22:25:13 +0000 (14:25 -0800)]
Merge "Media Provider and MTP now use emulated /mnt/sdcard instead of /data/media" into honeycomb
Mike Lockwood [Wed, 12 Jan 2011 22:25:05 +0000 (14:25 -0800)]
Merge "Remove permission android.permission.WRITE_MEDIA_STORAGE" into honeycomb
Romain Guy [Wed, 12 Jan 2011 22:17:59 +0000 (14:17 -0800)]
am
e465b117: Merge "Better debug info for layers." into honeycomb
* commit '
e465b11745cdc49283c360fb2acf01649f4f4fb0':
Better debug info for layers.
Romain Guy [Wed, 12 Jan 2011 22:15:59 +0000 (14:15 -0800)]
Merge "Better debug info for layers." into honeycomb
Gilles Debunne [Wed, 12 Jan 2011 22:09:42 +0000 (14:09 -0800)]
am
54c38bf0: Merge "New QuickContactBadge holo style." into honeycomb
* commit '
54c38bf05da42e40b8726ab2b5a33762081e9345':
New QuickContactBadge holo style.
Gilles Debunne [Wed, 12 Jan 2011 22:07:26 +0000 (14:07 -0800)]
Merge "New QuickContactBadge holo style." into honeycomb
Jaikumar Ganesh [Wed, 12 Jan 2011 21:58:17 +0000 (13:58 -0800)]
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.
Jaikumar Ganesh [Wed, 12 Jan 2011 21:56:13 +0000 (13:56 -0800)]
Merge "DO NOT MERGE: Remove auto connection on ACL connection." into gingerbread
Eric Laurent [Wed, 12 Jan 2011 21:52:42 +0000 (13:52 -0800)]
am
bec4abaa: Merge "Fix issue
3302649." into gingerbread
* commit '
bec4abaa12bf6759f354b54119c5524cf9339e7b':
Fix issue
3302649.
Eric Laurent [Wed, 12 Jan 2011 21:50:51 +0000 (13:50 -0800)]
Merge "Fix issue
3302649." into gingerbread
Justin Ho [Wed, 12 Jan 2011 21:50:25 +0000 (13:50 -0800)]
am
7b667a0c: Merge "Updated flightmode assets" into gingerbread
* commit '
7b667a0c4b017af3c6b9e1f8a6dae56e2c53e07f':
Updated flightmode assets
Justin Ho [Wed, 12 Jan 2011 21:47:59 +0000 (13:47 -0800)]
Merge "Updated flightmode assets" into gingerbread
Jason Sams [Wed, 12 Jan 2011 21:33:22 +0000 (13:33 -0800)]
am
8f597fdf: Merge "Cleanup bitmap uploads Implement standalone mipmap generation." into honeycomb
* commit '
8f597fdfacd1b9cda6dfebf4f3a1c34d1ffb5b2f':
Cleanup bitmap uploads Implement standalone mipmap generation.
Jason Sams [Wed, 12 Jan 2011 21:30:41 +0000 (13:30 -0800)]
Merge "Cleanup bitmap uploads Implement standalone mipmap generation." into honeycomb
Amith Yamasani [Wed, 12 Jan 2011 21:20:04 +0000 (13:20 -0800)]
am
fb0a242b: Merge "Use light preference panel drawable for Theme.Light" into honeycomb
* commit '
fb0a242be65e4ddbda0cbaec1ac949d29568ac25':
Use light preference panel drawable for Theme.Light
Amith Yamasani [Wed, 12 Jan 2011 21:18:20 +0000 (13:18 -0800)]
Merge "Use light preference panel drawable for Theme.Light" into honeycomb
Jim Miller [Wed, 12 Jan 2011 21:16:56 +0000 (13:16 -0800)]
am
a3a078e3: Merge "Fix
3201849: Use custom Drawable for bg in lockscreen" into honeycomb
* commit '
a3a078e34317763ad1294e0164c147074584e2e8':
Fix
3201849: Use custom Drawable for bg in lockscreen
Jim Miller [Wed, 12 Jan 2011 21:14:33 +0000 (13:14 -0800)]
Merge "Fix
3201849: Use custom Drawable for bg in lockscreen" into honeycomb
Dianne Hackborn [Wed, 12 Jan 2011 21:01:42 +0000 (13:01 -0800)]
am
02e852f9: Merge "Make ProgressDialog a little less lame." into honeycomb
* commit '
02e852f968bac83947cd97a5fe7c7a7064774c5a':
Make ProgressDialog a little less lame.
Dianne Hackborn [Wed, 12 Jan 2011 20:59:27 +0000 (12:59 -0800)]
Merge "Make ProgressDialog a little less lame." into honeycomb
Romain Guy [Wed, 12 Jan 2011 20:52:41 +0000 (12:52 -0800)]
am
85354828: Merge "Cleanup GL objects on the correct thread." into honeycomb
* commit '
853548287ffe4eb85d1bd10669270292336d137a':
Cleanup GL objects on the correct thread.
Romain Guy [Wed, 12 Jan 2011 20:50:50 +0000 (12:50 -0800)]
Merge "Cleanup GL objects on the correct thread." into honeycomb
Romain Guy [Wed, 12 Jan 2011 20:49:35 +0000 (12:49 -0800)]
am
cf894c91: Merge "Fix CTS test. Bug #
3345445" into honeycomb
* commit '
cf894c91a9b6c7749c9bb325c9e54336b97df900':
Fix CTS test. Bug #
3345445