OSDN Git Service
Xavier Ducrohet [Thu, 13 Jan 2011 18:28:05 +0000 (10:28 -0800)]
am
1f1957f5: Merge "LayoutLib: move MockView back into its original package." into honeycomb
* commit '
1f1957f50fec4bc8d8716793d22bb23ee7fb4a7f':
LayoutLib: move MockView back into its original package.
Xavier Ducrohet [Thu, 13 Jan 2011 18:28:02 +0000 (10:28 -0800)]
am
66a95e4d: Merge "LayoutLib: Add getViewParent/getViewIndex on RenderSession." into honeycomb
* commit '
66a95e4dbeb1c6d33ceb7c320033041e7f8e2aaa':
LayoutLib: Add getViewParent/getViewIndex on RenderSession.
Nick Pelly [Thu, 13 Jan 2011 18:26:28 +0000 (10:26 -0800)]
am
18adceb4: am
a29bf14e: Merge "New Intent defined for RF ON/OFF events" into gingerbread
* commit '
18adceb4273655b6cf8eaa9c6a2237d6fc1b8881':
New Intent defined for RF ON/OFF events
Brad Fitzpatrick [Thu, 13 Jan 2011 18:26:19 +0000 (10:26 -0800)]
am
54f428a6: am
bdb7aee0: Merge "Fix for crash when setting live wallpaper."
* commit '
54f428a63f33f4722c09b7688e6ca7960394f81f':
Fix for crash when setting live wallpaper.
Kenny Root [Thu, 13 Jan 2011 18:26:13 +0000 (10:26 -0800)]
am
47075079: (-s ours) am
e8c04db7: Merge "Add the {get,set}PackageObbPaths calls to API" into gingerbread
* commit '
470750793b6e930a323ee63cbed05c43dc435ba1':
Add the {get,set}PackageObbPaths calls to API
James Dong [Thu, 13 Jan 2011 18:24:44 +0000 (10:24 -0800)]
am
c14b10c3: Merge "Add audio encoding parameters check" into honeycomb
* commit '
c14b10c3068359b717b3f35b7218ce0e6dcdd08c':
Add audio encoding parameters check
Svetoslav Ganov [Thu, 13 Jan 2011 18:24:38 +0000 (10:24 -0800)]
am
06e32b43: Merge "Updating the WebView accessibility key bindings after discussion with the access-eng team" into honeycomb
* commit '
06e32b434b62b22eeee900851ff56f2098ddc019':
Updating the WebView accessibility key bindings after discussion with the access-eng team
Xavier Ducrohet [Thu, 13 Jan 2011 18:22:53 +0000 (10:22 -0800)]
Merge "LayoutLib: move MockView back into its original package." into honeycomb
Xavier Ducrohet [Thu, 13 Jan 2011 18:22:43 +0000 (10:22 -0800)]
Merge "LayoutLib: Add getViewParent/getViewIndex on RenderSession." into honeycomb
James Dong [Thu, 13 Jan 2011 18:21:28 +0000 (10:21 -0800)]
Merge "Add audio encoding parameters check" into honeycomb
Jaikumar Ganesh [Thu, 13 Jan 2011 18:21:15 +0000 (10:21 -0800)]
am
b54fd91d: Merge "Phone crash when old callback func is woken up when enabling BT." into honeycomb
* commit '
b54fd91d1b843b7742bf6396cefa6c63b14dc6df':
Phone crash when old callback func is woken up when enabling BT.
Alex Sakhartchouk [Thu, 13 Jan 2011 18:20:28 +0000 (10:20 -0800)]
am
d88ad4ab: Merge "Documentation" into honeycomb
* commit '
d88ad4ab49280a19da6582ba6e776c296be79ec0':
Documentation
Robert Greenwalt [Thu, 13 Jan 2011 18:19:39 +0000 (10:19 -0800)]
am
495056ab: Merge "Turn off DUN connection after tethering." into honeycomb
* commit '
495056ab6709bbf77879a4b556aa1d17446bfe48':
Turn off DUN connection after tethering.
Gilles Debunne [Thu, 13 Jan 2011 18:19:30 +0000 (10:19 -0800)]
am
b439221a: Merge "QuickContactBadge shows its pressed state" into honeycomb
* commit '
b439221a5aa7c36fedb242ee9180ce46e4ad19b7':
QuickContactBadge shows its pressed state
Svetoslav Ganov [Thu, 13 Jan 2011 18:17:02 +0000 (10:17 -0800)]
Merge "Updating the WebView accessibility key bindings after discussion with the access-eng team" into honeycomb
Jaikumar Ganesh [Thu, 13 Jan 2011 18:14:40 +0000 (10:14 -0800)]
Merge "Phone crash when old callback func is woken up when enabling BT." into honeycomb
Alex Sakhartchouk [Thu, 13 Jan 2011 18:14:14 +0000 (10:14 -0800)]
Merge "Documentation" into honeycomb
Robert Greenwalt [Thu, 13 Jan 2011 18:02:29 +0000 (10:02 -0800)]
Merge "Turn off DUN connection after tethering." into honeycomb
Gilles Debunne [Thu, 13 Jan 2011 17:50:40 +0000 (09:50 -0800)]
Merge "QuickContactBadge shows its pressed state" into honeycomb
Jason parks [Thu, 13 Jan 2011 15:44:55 +0000 (07:44 -0800)]
am
21f62b9e: Merge "Add a method enable encryption." into honeycomb
* commit '
21f62b9e461416ae61c8471f7199f104f8fe33de':
Add a method enable encryption.
Jason parks [Thu, 13 Jan 2011 15:42:55 +0000 (07:42 -0800)]
am
ca6777b2: Merge "Remove the APIs for the old encryption scheme." into honeycomb
* commit '
ca6777b23bbe9283380efb2ba7e6d0a79d8669db':
Remove the APIs for the old encryption scheme.
Jason parks [Thu, 13 Jan 2011 15:41:53 +0000 (07:41 -0800)]
Merge "Add a method enable encryption." into honeycomb
Jason parks [Thu, 13 Jan 2011 15:40:46 +0000 (07:40 -0800)]
Merge "Remove the APIs for the old encryption scheme." into honeycomb
Marco Nelissen [Thu, 13 Jan 2011 15:31:53 +0000 (07:31 -0800)]
am
f679ba7d: Cherrypick from GB. Do Not Merge.
* commit '
f679ba7d944a403fbdc77926c44978ffd5161f2d':
Cherrypick from GB. Do Not Merge.
Ben Murdoch [Thu, 13 Jan 2011 14:47:45 +0000 (06:47 -0800)]
am
6b3dc7a2: Merge "Improve error handling (NPE in DRT2)" into honeycomb
* commit '
6b3dc7a29a5c642c6ca2214c47199dec71912d0d':
Improve error handling (NPE in DRT2)
Ben Murdoch [Thu, 13 Jan 2011 14:46:17 +0000 (06:46 -0800)]
Merge "Improve error handling (NPE in DRT2)" into honeycomb
Wink Saville [Thu, 13 Jan 2011 14:26:23 +0000 (06:26 -0800)]
am
5bf6cc01: Merge "Initialize mOtaspMode to OTASP_UNKNOWN." into honeycomb
* commit '
5bf6cc0126b5e554f629bb4c96716a2a5701d04b':
Initialize mOtaspMode to OTASP_UNKNOWN.
Wink Saville [Thu, 13 Jan 2011 14:24:09 +0000 (06:24 -0800)]
Merge "Initialize mOtaspMode to OTASP_UNKNOWN." into honeycomb
Shih-wei Liao [Thu, 13 Jan 2011 10:23:21 +0000 (02:23 -0800)]
Shih-wei Liao [Thu, 13 Jan 2011 10:07:53 +0000 (02:07 -0800)]
am
078717be: Merge "Disable on-device linking" into honeycomb
* commit '
078717be074e4f68b9af37d70ecbd63702b2be6c':
Disable on-device linking
Shih-wei Liao [Thu, 13 Jan 2011 10:07:48 +0000 (02:07 -0800)]
am
c758f1c6: Merge "Fix the build." into honeycomb
* commit '
c758f1c6a3bd0a65c85572847903c44307d04237':
Fix the build.
Shih-wei Liao [Thu, 13 Jan 2011 10:07:39 +0000 (02:07 -0800)]
am
f6dd9c53: Merge "On-device linking." into honeycomb
* commit '
f6dd9c539c1b18f65674b495cb23bf2df36da7af':
On-device linking.
Shih-wei Liao [Thu, 13 Jan 2011 10:06:17 +0000 (02:06 -0800)]
Merge "Disable on-device linking" into honeycomb
Shih-wei Liao [Thu, 13 Jan 2011 10:05:32 +0000 (02:05 -0800)]
am
3ae5017b: Merge "convert2uchar3." into honeycomb
* commit '
3ae5017b1bc2910610194cc8790e8d96516ac9b5':
convert2uchar3.
Shih-wei Liao [Thu, 13 Jan 2011 10:04:10 +0000 (02:04 -0800)]
Merge "Fix the build." into honeycomb
Shih-wei Liao [Thu, 13 Jan 2011 10:04:00 +0000 (02:04 -0800)]
Merge "On-device linking." into honeycomb
Shih-wei Liao [Thu, 13 Jan 2011 10:03:51 +0000 (02:03 -0800)]
Merge "convert2uchar3." into honeycomb
Adam Powell [Thu, 13 Jan 2011 07:52:25 +0000 (23:52 -0800)]
am
2ea9aaa2: Merge "Fix bugs
3077517 and
3309579 - ListView bugs" into honeycomb
* commit '
2ea9aaa2458ca468b8f127d8c69746a009df12a6':
Fix bugs
3077517 and
3309579 - ListView bugs
Adam Powell [Thu, 13 Jan 2011 07:50:05 +0000 (23:50 -0800)]
Merge "Fix bugs
3077517 and
3309579 - ListView bugs" into honeycomb
Guang Zhu [Thu, 13 Jan 2011 07:32:00 +0000 (23:32 -0800)]
am
37f81344: Merge "change webkit test data path" into honeycomb
* commit '
37f813443dbe51277c2d849eb2b53caa137d50f7':
change webkit test data path
Guang Zhu [Thu, 13 Jan 2011 07:29:53 +0000 (23:29 -0800)]
Merge "change webkit test data path" into honeycomb
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
Nick Pelly [Thu, 13 Jan 2011 00:33:48 +0000 (16:33 -0800)]
am
a29bf14e: Merge "New Intent defined for RF ON/OFF events" into gingerbread
* commit '
a29bf14e1d2857debc632ce4304a1c72dded348c':
New Intent defined for RF ON/OFF events
Nick Pelly [Thu, 13 Jan 2011 00:28:59 +0000 (16:28 -0800)]
Merge "New Intent defined for RF ON/OFF events" into gingerbread
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.
Brad Fitzpatrick [Wed, 12 Jan 2011 23:59:44 +0000 (15:59 -0800)]
am
bdb7aee0: Merge "Fix for crash when setting live wallpaper."
* commit '
bdb7aee0a4934eb138f7caaf921f6c86f350b4b7':
Fix for crash when setting live wallpaper.
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
Brad Fitzpatrick [Wed, 12 Jan 2011 23:45:05 +0000 (15:45 -0800)]
Merge "Fix for crash when setting live wallpaper."
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
Kenny Root [Wed, 12 Jan 2011 23:06:51 +0000 (15:06 -0800)]
am
e8c04db7: Merge "Add the {get,set}PackageObbPaths calls to API" into gingerbread
* commit '
e8c04db71e347396e9537ead7113ba9f46706e44':
Add the {get,set}PackageObbPaths calls to API
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
Kenny Root [Wed, 12 Jan 2011 23:03:43 +0000 (15:03 -0800)]
Merge "Add the {get,set}PackageObbPaths calls to API" into gingerbread