Mike Lockwood
ab9b12795e
am bd65c065: am a13732e1: Merge "MTP: Fix month off by one error in date parsing and formatting code" into honeycomb
...
* commit 'bd65c065b2dcb54dde563a8a21c9f92da947c7dd':
MTP: Fix month off by one error in date parsing and formatting code
2011-01-26 15:34:15 -08:00
Mike Lockwood
b07d158c7f
am a13732e1: Merge "MTP: Fix month off by one error in date parsing and formatting code" into honeycomb
...
* commit 'a13732e17a0f3d69df9c418407985b3ad64b1852':
MTP: Fix month off by one error in date parsing and formatting code
2011-01-26 15:32:11 -08:00
Jason Chen
0ab66bd33b
Merge "Cherry-pick of f5e4f208b9ed73 to honeycomb" into honeycomb
2011-01-26 15:30:56 -08:00
Mike Lockwood
ee4c8a9838
Merge "MTP: Fix month off by one error in date parsing and formatting code" into honeycomb
2011-01-26 15:30:07 -08:00
Jeff Brown
dfba4b46ec
am 7b448b8a: Merge "Move keymaps from sdk/emulator/keymaps."
...
* commit '7b448b8a6c1ababc3a3e4553ebe9bac7473051c8':
Move keymaps from sdk/emulator/keymaps.
2011-01-26 15:03:32 -08:00
Shih-wei Liao
a12c57201d
am dde78c2b: am 79204b98: Merge "Part II of fixing b/2943524: On-device linking rs_core." into honeycomb
...
* commit 'dde78c2b1c2c2ea28b6799ac135477386ae5df93':
Part II of fixing b/2943524: On-device linking rs_core.
2011-01-26 15:00:44 -08:00
Shih-wei Liao
2990963e65
am 79204b98: Merge "Part II of fixing b/2943524: On-device linking rs_core." into honeycomb
...
* commit '79204b98d260d8f5e8419f5149b31b336424aec5':
Part II of fixing b/2943524: On-device linking rs_core.
2011-01-26 14:58:57 -08:00
Shih-wei Liao
2622aca0b6
Merge "Part II of fixing b/2943524: On-device linking rs_core." into honeycomb
2011-01-26 14:56:41 -08:00
John Wang
f0026cdd96
am 9c90f6d9: am 7b4ba9d8: Merge "Enable recovery in RIL wakelock release check." into honeycomb
...
* commit '9c90f6d9fdaf128bbe07d4aca35ed08c5326b7c5':
Enable recovery in RIL wakelock release check.
2011-01-26 14:52:10 -08:00
James Dong
f0b7ebd466
am 8bea1d55: am 7fb232c4: Merge "Make sure that key frame is generated for timelapse video recording if there are at least two input video frames from camera source." into honeycomb
...
* commit '8bea1d5585822bb62996e789f59c7629dfd9ac50':
Make sure that key frame is generated for timelapse video recording if there are at least two input video frames from camera source.
2011-01-26 14:49:23 -08:00
John Wang
a465f8a374
am 7b4ba9d8: Merge "Enable recovery in RIL wakelock release check." into honeycomb
...
* commit '7b4ba9d80d2cdde310c29d01d0e22c7815d84261':
Enable recovery in RIL wakelock release check.
2011-01-26 14:48:34 -08:00
James Dong
30fb571eb2
am 7fb232c4: Merge "Make sure that key frame is generated for timelapse video recording if there are at least two input video frames from camera source." into honeycomb
...
* commit '7fb232c40cde91d0958be1694db2d97a126b95f9':
Make sure that key frame is generated for timelapse video recording if there are at least two input video frames from camera source.
2011-01-26 14:45:41 -08:00
John Wang
4d8c9b9d87
Merge "Enable recovery in RIL wakelock release check." into honeycomb
2011-01-26 14:45:24 -08:00
James Dong
e002d770df
Merge "Make sure that key frame is generated for timelapse video recording if there are at least two input video frames from camera source." into honeycomb
2011-01-26 14:43:59 -08:00
Svetoslav Ganov
520d09df9b
am 54fc7807: am df467264: Merge "Final polish of WebView accessibility support for no JavaScript case." into honeycomb
...
* commit '54fc78072fec46933ca5ee96c7642bd4b9fc540f':
Final polish of WebView accessibility support for no JavaScript case.
2011-01-26 14:43:18 -08:00
Svetoslav Ganov
03c0f75cc7
am df467264: Merge "Final polish of WebView accessibility support for no JavaScript case." into honeycomb
...
* commit 'df4672643b92208b4ab7f9ab995dca8b69d3c458':
Final polish of WebView accessibility support for no JavaScript case.
2011-01-26 14:41:33 -08:00
Svetoslav Ganov
abc1b5db7a
Merge "Final polish of WebView accessibility support for no JavaScript case." into honeycomb
2011-01-26 14:39:47 -08:00
Jeff Brown
e8fecc4f7f
Merge "Move keymaps from sdk/emulator/keymaps."
2011-01-26 14:25:08 -08:00
Dianne Hackborn
c12c5ad801
am 49295e53: am ccd79399: am 1d07b5bc: Merge "Make CHANGE_COMPONENT_ENABLED_STATE a signatureOrSystem perm." into gingerbread
...
* commit '49295e5379472c22af8975e32271f9659c016531':
Make CHANGE_COMPONENT_ENABLED_STATE a signatureOrSystem perm.
2011-01-26 14:17:37 -08:00
Robert Greenwalt
93fd708b90
Merge "Get rid of manual int->ipv4 string generation"
2011-01-26 14:16:42 -08:00
Jean-Michel Trivi
92370c954f
am b8efdf7f: (-s ours) am 1155efdc: (-s ours) am 2ba92c71: do not merge bug 3370834 Cherrypick from master
...
* commit 'b8efdf7f80d9aa2cbeff881f22d283cf5045c379':
do not merge bug 3370834 Cherrypick from master
2011-01-26 14:15:15 -08:00
Dianne Hackborn
4d2ea4ff34
am ccd79399: am 1d07b5bc: Merge "Make CHANGE_COMPONENT_ENABLED_STATE a signatureOrSystem perm." into gingerbread
...
* commit 'ccd79399cc2a28d79287fd1558c5f5a530356003':
Make CHANGE_COMPONENT_ENABLED_STATE a signatureOrSystem perm.
2011-01-26 14:15:08 -08:00
Stephen Hines
b2db302825
am 203107d4: am 8fc7690f: Merge "Hook up tgammaf properly for RS." into honeycomb
...
* commit '203107d4901704c33eca2e5f7e5cd967fd372bbe':
Hook up tgammaf properly for RS.
2011-01-26 14:13:06 -08:00
Jean-Michel Trivi
dcd6b8fa48
am 1155efdc: (-s ours) am 2ba92c71: do not merge bug 3370834 Cherrypick from master
...
* commit '1155efdc715413cd7a881e5226b5f5f0b2db8f71':
do not merge bug 3370834 Cherrypick from master
2011-01-26 14:12:45 -08:00
Stephen Hines
46daf3188c
am 8fc7690f: Merge "Hook up tgammaf properly for RS." into honeycomb
...
* commit '8fc7690f2b42c27f9f609647b96c17234aa9d78e':
Hook up tgammaf properly for RS.
2011-01-26 14:10:58 -08:00
Stephen Hines
491392620b
Merge "Hook up tgammaf properly for RS." into honeycomb
2011-01-26 14:08:49 -08:00
Dianne Hackborn
e0ee64bbeb
am 1d07b5bc: Merge "Make CHANGE_COMPONENT_ENABLED_STATE a signatureOrSystem perm." into gingerbread
...
* commit '1d07b5bc9b0a9e3de4495834242548a600cae1d8':
Make CHANGE_COMPONENT_ENABLED_STATE a signatureOrSystem perm.
2011-01-26 14:08:30 -08:00
Jean-Michel Trivi
abf02a95a0
am 2ba92c71: do not merge bug 3370834 Cherrypick from master
...
* commit '2ba92c71b5684dce700cf848bf157153c156df1d':
do not merge bug 3370834 Cherrypick from master
2011-01-26 14:05:18 -08:00
Dianne Hackborn
afb1ae6448
Merge "Make CHANGE_COMPONENT_ENABLED_STATE a signatureOrSystem perm." into gingerbread
2011-01-26 13:59:42 -08:00
Romain Guy
0cc13a63bf
am 08cdf6fd: am 940df6dd: Merge "Remove unused API" into honeycomb
...
* commit '08cdf6fd9ac9bbbd77024518c45034d66b5830c6':
Remove unused API
2011-01-26 13:44:35 -08:00
Romain Guy
bd85513b9a
am 940df6dd: Merge "Remove unused API" into honeycomb
...
* commit '940df6dd83624e5f46b147837d848853a1dab9b2':
Remove unused API
2011-01-26 13:42:53 -08:00
Romain Guy
12560573d3
Merge "Remove unused API" into honeycomb
2011-01-26 13:41:10 -08:00
Gilles Debunne
2e07732b0e
am 9aa5b8da: am 12b2dc23: Merge "Holo theme for error popups in TextViews." into honeycomb
...
* commit '9aa5b8dad015f08251a3a75c9f790e86670c6914':
Holo theme for error popups in TextViews.
2011-01-26 13:37:07 -08:00
Gilles Debunne
a59942c26e
am 12b2dc23: Merge "Holo theme for error popups in TextViews." into honeycomb
...
* commit '12b2dc23cc3cdd9dcd6bac91adc8e4198502bab5':
Holo theme for error popups in TextViews.
2011-01-26 13:35:28 -08:00
Gilles Debunne
27ccdef457
Merge "Holo theme for error popups in TextViews." into honeycomb
2011-01-26 13:33:24 -08:00
Adam Cohen
cceb5f4651
am eca572f5: am 10f27c5a: Merge "Fixing bug where widgets would go dead after moving to another screen" into honeycomb
...
* commit 'eca572f5d9c073b789de027df2971860eb393d6d':
Fixing bug where widgets would go dead after moving to another screen
2011-01-26 13:30:44 -08:00
Adam Cohen
5c9288cee6
am 10f27c5a: Merge "Fixing bug where widgets would go dead after moving to another screen" into honeycomb
...
* commit '10f27c5a42e6da262d178d426944b2b31c185f4a':
Fixing bug where widgets would go dead after moving to another screen
2011-01-26 13:29:07 -08:00
Shimeng (Simon) Wang
996f8d216a
am c1df157a: am 07837862: Merge "Fine tune the high memory threshold and usage delta for v8 GC." into honeycomb
...
* commit 'c1df157a60164e23ac45701d9e5da6d4edcc756c':
Fine tune the high memory threshold and usage delta for v8 GC.
2011-01-26 13:28:34 -08:00
Adam Cohen
ef66a36846
Merge "Fixing bug where widgets would go dead after moving to another screen" into honeycomb
2011-01-26 13:26:58 -08:00
Shimeng (Simon) Wang
68d66a4ca4
am 07837862: Merge "Fine tune the high memory threshold and usage delta for v8 GC." into honeycomb
...
* commit '078378624c1955a1e842af34f79798918edccc21':
Fine tune the high memory threshold and usage delta for v8 GC.
2011-01-26 13:25:50 -08:00
Shimeng (Simon) Wang
5aa66b68d2
Merge "Fine tune the high memory threshold and usage delta for v8 GC." into honeycomb
2011-01-26 13:23:58 -08:00
Justin Ho
086a733cde
am 4b1c8389: am 8a445fc3: Merge "Integrating drawable-xlarge stat_sys assets" into honeycomb
...
* commit '4b1c838959b27b14209f8f446f95630232b93cef':
Integrating drawable-xlarge stat_sys assets
2011-01-26 13:05:38 -08:00
Justin Ho
8fa2997edc
am 8a445fc3: Merge "Integrating drawable-xlarge stat_sys assets" into honeycomb
...
* commit '8a445fc30e45c1f7a9805ae19948ec32786458a0':
Integrating drawable-xlarge stat_sys assets
2011-01-26 13:04:18 -08:00
Justin Ho
362d419c91
Merge "Integrating drawable-xlarge stat_sys assets" into honeycomb
2011-01-26 13:02:01 -08:00
Daniel Sandler
cece4b3cda
am 26d7aea7: am 044602b2: Merge "Ticker visual fixes." into honeycomb
...
* commit '26d7aea7b7bd4439cf85ea0a2d2d58b05a0f4642':
Ticker visual fixes.
2011-01-26 12:55:16 -08:00
Daniel Sandler
96701f6c2e
am 044602b2: Merge "Ticker visual fixes." into honeycomb
...
* commit '044602b226638e92907fbd573723772856256259':
Ticker visual fixes.
2011-01-26 12:53:58 -08:00
Dharmaray Kundargi
aaa0dee53b
am 666b9eb3: am 45e3d123: Merge "Overlay java files Issue 3370836" into honeycomb
...
* commit '666b9eb3a260034c85e2a6eaa5e8f4ceea968f33':
Overlay java files Issue 3370836
2011-01-26 12:52:05 -08:00
Dharmaray Kundargi
e9ec4ea8e8
am 81bebad0: am ecebf173: Merge "Fix for Issue 3370836 : JNI files for Overlay optmization." into honeycomb
...
* commit '81bebad0f1fa0bda5a74e4e78b43bd94bd94bf40':
Fix for Issue 3370836 : JNI files for Overlay optmization.
2011-01-26 12:51:58 -08:00
Daniel Sandler
5d87d2e82d
Merge "Ticker visual fixes." into honeycomb
2011-01-26 12:51:30 -08:00
Dharmaray Kundargi
706fff9241
am 45e3d123: Merge "Overlay java files Issue 3370836" into honeycomb
...
* commit '45e3d123bce32a8b1f469d366ebb1d3f9ccb2bfc':
Overlay java files Issue 3370836
2011-01-26 12:48:32 -08:00