OSDN Git Service
Svetoslav Ganov [Thu, 27 Jan 2011 07:01:03 +0000 (23:01 -0800)]
am
c291a7bf: Merge "The calendar view widget was jumping incorrectly to the next week while selectiong the last day of the week." into honeycomb
* commit '
c291a7bf7a163cea10be135279103f72a6418383':
The calendar view widget was jumping incorrectly to the next week while selectiong the last day of the week.
Svetoslav Ganov [Thu, 27 Jan 2011 06:59:23 +0000 (22:59 -0800)]
Merge "The calendar view widget was jumping incorrectly to the next week while selectiong the last day of the week." into honeycomb
Basavapatna Dattaguru [Thu, 27 Jan 2011 06:52:38 +0000 (22:52 -0800)]
am
89378fd1: Merge "Revert "Video editor CTS: Framework modifications"" into honeycomb
* commit '
89378fd1666cd589599a0c5a7d0c71fa2f8159a5':
Revert "Video editor CTS: Framework modifications"
Basavapatna Dattaguru [Thu, 27 Jan 2011 06:52:31 +0000 (22:52 -0800)]
am
3b728ca7: Merge "Revert "Fixes Issue ID:
3396697"" into honeycomb
* commit '
3b728ca70a4fe6760b682589505d76848c47d765':
Revert "Fixes Issue ID:
3396697"
Basavapatna Dattaguru [Thu, 27 Jan 2011 06:50:59 +0000 (22:50 -0800)]
Merge "Revert "Video editor CTS: Framework modifications"" into honeycomb
Basavapatna Dattaguru [Thu, 27 Jan 2011 06:50:50 +0000 (22:50 -0800)]
Merge "Revert "Fixes Issue ID:
3396697"" into honeycomb
Romain Guy [Thu, 27 Jan 2011 06:47:01 +0000 (22:47 -0800)]
am
7c53a0d6: Merge "Don\'t draw the same triangles several times. Bug #
3388197" into honeycomb
* commit '
7c53a0d6078620df3abc4997acfe267ef903f5c6':
Don't draw the same triangles several times. Bug #
3388197
Adam Cohen [Thu, 27 Jan 2011 06:44:53 +0000 (22:44 -0800)]
am
3b52ca3b: Merge "Fixing some ugly StackView relayouts on rotation" into honeycomb
* commit '
3b52ca3bbcb989200abff5582ef569d5f316d7f5':
Fixing some ugly StackView relayouts on rotation
Romain Guy [Thu, 27 Jan 2011 06:44:02 +0000 (22:44 -0800)]
Merge "Don't draw the same triangles several times. Bug #
3388197" into honeycomb
Adam Cohen [Thu, 27 Jan 2011 06:41:43 +0000 (22:41 -0800)]
Merge "Fixing some ugly StackView relayouts on rotation" into honeycomb
Joe Onorato [Thu, 27 Jan 2011 06:23:56 +0000 (22:23 -0800)]
am
e193c468: Merge "Fix
3388705: Explicitly check for low battery level" into honeycomb
* commit '
e193c4688f9062e1d4dba97413788b6ffa122a55':
Fix
3388705: Explicitly check for low battery level
Joe Onorato [Thu, 27 Jan 2011 06:21:26 +0000 (22:21 -0800)]
Merge "Fix
3388705: Explicitly check for low battery level" into honeycomb
Joe Onorato [Thu, 27 Jan 2011 06:02:18 +0000 (22:02 -0800)]
am
ea1fbe9c: Merge "Revert "getRingtone is causing an anr. Turn it off for now."" into honeycomb
* commit '
ea1fbe9c8c9fe32690252dcc4dc96c93ae03f686':
Revert "getRingtone is causing an anr. Turn it off for now."
Joe Onorato [Thu, 27 Jan 2011 06:00:07 +0000 (22:00 -0800)]
Merge "Revert "getRingtone is causing an anr. Turn it off for now."" into honeycomb
Basavapatna Dattaguru [Thu, 27 Jan 2011 05:51:49 +0000 (21:51 -0800)]
am
9af5da52: Merge "Video editor CTS: Framework modifications" into honeycomb
* commit '
9af5da5258d14c743150318e9887b7d10c0117d4':
Video editor CTS: Framework modifications
Basavapatna Dattaguru [Thu, 27 Jan 2011 05:49:34 +0000 (21:49 -0800)]
am
643e8476: Merge "Fixes Issue ID:
3396697" into honeycomb
* commit '
643e8476e1b9da93a06d073797863298ae268393':
Fixes Issue ID:
3396697
Basavapatna Dattaguru [Thu, 27 Jan 2011 05:48:02 +0000 (21:48 -0800)]
Merge "Video editor CTS: Framework modifications" into honeycomb
Basavapatna Dattaguru [Thu, 27 Jan 2011 05:47:40 +0000 (21:47 -0800)]
Merge "Fixes Issue ID:
3396697" into honeycomb
Justin Ho [Thu, 27 Jan 2011 05:41:50 +0000 (21:41 -0800)]
am
08006286: Merge "New stat_sys_download/upload icons" into honeycomb
* commit '
08006286b40cf9031766a97e4d50ebb47c8b514d':
New stat_sys_download/upload icons
Justin Ho [Thu, 27 Jan 2011 05:37:22 +0000 (21:37 -0800)]
Merge "New stat_sys_download/upload icons" into honeycomb
James Dong [Thu, 27 Jan 2011 05:15:37 +0000 (21:15 -0800)]
am
3b1fd35c: Merge "Eliminate duplicated code in export method" into honeycomb
* commit '
3b1fd35c6876f7eb1d15db3095c3e57969783302':
Eliminate duplicated code in export method
Kenny Root [Thu, 27 Jan 2011 05:15:28 +0000 (21:15 -0800)]
am
5d506fa7: Merge "Add API for preferred Launcher icon size and density" into honeycomb
* commit '
5d506fa7274e8ba84e348e11c22729b58802f796':
Add API for preferred Launcher icon size and density
Xavier Ducrohet [Thu, 27 Jan 2011 05:15:22 +0000 (21:15 -0800)]
am
62461d12: Merge "LayoutLib: put a default image on the quickcontactbadge." into honeycomb
* commit '
62461d128fcb1314d96661e77f9744e5e50f57e3':
LayoutLib: put a default image on the quickcontactbadge.
Jim Miller [Thu, 27 Jan 2011 05:15:17 +0000 (21:15 -0800)]
am
57d472a5: Merge "Fix
3381324: Restart ripples when the user moves away from the edge." into honeycomb
* commit '
57d472a5b1f69e3aa0159f41c7ef625d4418c27f':
Fix
3381324: Restart ripples when the user moves away from the edge.
Justin Ho [Thu, 27 Jan 2011 05:15:10 +0000 (21:15 -0800)]
am
597e644d: Merge "Integrating xlarge mdpi battery charging assets" into honeycomb
* commit '
597e644d7a445e6f5555f3f51b6ed78b1e6c1243':
Integrating xlarge mdpi battery charging assets
Michael Kolb [Thu, 27 Jan 2011 05:15:01 +0000 (21:15 -0800)]
am
85fd2c91: Merge "fix incognito url loading" into honeycomb
* commit '
85fd2c9102f7cf105bf498f05ca35360a4bcede5':
fix incognito url loading
James Dong [Thu, 27 Jan 2011 04:42:18 +0000 (20:42 -0800)]
Merge "Eliminate duplicated code in export method" into honeycomb
Kenny Root [Thu, 27 Jan 2011 04:16:31 +0000 (20:16 -0800)]
Merge "Add API for preferred Launcher icon size and density" into honeycomb
Xavier Ducrohet [Thu, 27 Jan 2011 03:54:46 +0000 (19:54 -0800)]
Merge "LayoutLib: put a default image on the quickcontactbadge." into honeycomb
Jim Miller [Thu, 27 Jan 2011 03:39:23 +0000 (19:39 -0800)]
Merge "Fix
3381324: Restart ripples when the user moves away from the edge." into honeycomb
Justin Ho [Thu, 27 Jan 2011 03:34:50 +0000 (19:34 -0800)]
Merge "Integrating xlarge mdpi battery charging assets" into honeycomb
Michael Kolb [Thu, 27 Jan 2011 03:21:49 +0000 (19:21 -0800)]
Merge "fix incognito url loading" into honeycomb
Dianne Hackborn [Thu, 27 Jan 2011 03:08:20 +0000 (19:08 -0800)]
am
2dc9c784: Merge "Fix issue #
3382992: IME close animation stutters from URL bar" into honeycomb
* commit '
2dc9c784b2fab67a8233318f559e65f444bf0c97':
Fix issue #
3382992: IME close animation stutters from URL bar
Dianne Hackborn [Thu, 27 Jan 2011 03:04:15 +0000 (19:04 -0800)]
Merge "Fix issue #
3382992: IME close animation stutters from URL bar" into honeycomb
Scott Main [Thu, 27 Jan 2011 02:48:22 +0000 (18:48 -0800)]
Merge "resolved conflicts for merge of
77ba255e to honeycomb-plus-aosp" into honeycomb-plus-aosp
Romain Guy [Thu, 27 Jan 2011 02:47:59 +0000 (18:47 -0800)]
am
ede54ce2: Merge "Fix crash in movie studio." into honeycomb
* commit '
ede54ce2fe3252d4ab56b90de464b35a6920970d':
Fix crash in movie studio.
Scott Main [Thu, 27 Jan 2011 02:45:42 +0000 (18:45 -0800)]
resolved conflicts for merge of
77ba255e to honeycomb-plus-aosp
Change-Id: Ib40af8301e19b70c86161fc0a6cc061b118863ab
Romain Guy [Thu, 27 Jan 2011 02:46:29 +0000 (18:46 -0800)]
Merge "Fix crash in movie studio." into honeycomb
Scott Main [Thu, 27 Jan 2011 02:37:22 +0000 (18:37 -0800)]
am
ba3dd323: enable preview mode for docs and add api level 10 flag for api level diffs
* commit '
ba3dd32357b47ab0b55a1976bbafc225df78a59d':
enable preview mode for docs and add api level 10 flag for api level diffs
Romain Guy [Thu, 27 Jan 2011 02:32:54 +0000 (18:32 -0800)]
am
9c8307fb: Merge "Make sure that we update SurfaceView\'s window with display lists. Bug #
3395487" into honeycomb
* commit '
9c8307fb19558ffe2e897bad009fb038bb9e845b':
Make sure that we update SurfaceView's window with display lists. Bug #
3395487
Romain Guy [Thu, 27 Jan 2011 02:29:38 +0000 (18:29 -0800)]
Merge "Make sure that we update SurfaceView's window with display lists. Bug #
3395487" into honeycomb
Daniel Sandler [Thu, 27 Jan 2011 02:19:19 +0000 (18:19 -0800)]
am
da597b5c: Merge "Status bar visual tweaks." into honeycomb
* commit '
da597b5c1a6553a43f1e938ef87b29c8f2a59386':
Status bar visual tweaks.
Daniel Sandler [Thu, 27 Jan 2011 02:17:49 +0000 (18:17 -0800)]
Merge "Status bar visual tweaks." into honeycomb
Gilles Debunne [Thu, 27 Jan 2011 02:10:58 +0000 (18:10 -0800)]
am
bc3f7937: Merge "Tabs are resized to make sure they fit in their parent." into honeycomb
* commit '
bc3f79371bb93e075bcb91d92180487337afce17':
Tabs are resized to make sure they fit in their parent.
Gilles Debunne [Thu, 27 Jan 2011 02:09:23 +0000 (18:09 -0800)]
Merge "Tabs are resized to make sure they fit in their parent." into honeycomb
Jaikumar Ganesh [Thu, 27 Jan 2011 02:03:40 +0000 (18:03 -0800)]
am
55271a79: Merge "Disable PBAP for no voice capability" into honeycomb
* commit '
55271a79d1c14e2952d550995569135a23971672':
Disable PBAP for no voice capability
Shih-wei Liao [Thu, 27 Jan 2011 02:03:31 +0000 (18:03 -0800)]
am
b9d69d59: Merge "For rs_cl, fix _RS_STATIC (used while we do on-host linking). Now we do on-device linking, STATIC no longer makes sense. (b/
2943524)" into honeycomb
* commit '
b9d69d595fa17ae87b4e615c2339df64a5df8324':
For rs_cl, fix _RS_STATIC (used while we do on-host linking). Now we do on-device linking, STATIC no longer makes sense. (b/
2943524)
Dianne Hackborn [Thu, 27 Jan 2011 02:03:18 +0000 (18:03 -0800)]
am
14cd455d: Merge "Import revised translations. DO NOT MERGE" into honeycomb
* commit '
14cd455dd57f2708b63f88aab24ba6c75d13d96f':
Import revised translations. DO NOT MERGE
Scott Main [Thu, 27 Jan 2011 01:58:54 +0000 (17:58 -0800)]
am
bedd2427: am
a7ce2f04: Merge "catchup the gingerbread branch to gingerbread-docs for all sdk docs" into gingerbread
* commit '
bedd242768f7594d12bde0b4c4e7d153c27858d4':
catchup the gingerbread branch to gingerbread-docs for all sdk docs
Scott Main [Thu, 27 Jan 2011 01:56:26 +0000 (17:56 -0800)]
am
a7ce2f04: Merge "catchup the gingerbread branch to gingerbread-docs for all sdk docs" into gingerbread
* commit '
a7ce2f04ef0ae548370eebd1314558f24f40e8f0':
catchup the gingerbread branch to gingerbread-docs for all sdk docs
Jaikumar Ganesh [Thu, 27 Jan 2011 01:52:50 +0000 (17:52 -0800)]
Merge "Disable PBAP for no voice capability" into honeycomb
Scott Main [Thu, 27 Jan 2011 01:52:08 +0000 (17:52 -0800)]
Merge "catchup the gingerbread branch to gingerbread-docs for all sdk docs" into gingerbread
Shih-wei Liao [Thu, 27 Jan 2011 01:43:13 +0000 (17:43 -0800)]
Merge "For rs_cl, fix _RS_STATIC (used while we do on-host linking). Now we do on-device linking, STATIC no longer makes sense. (b/
2943524)" into honeycomb
Dianne Hackborn [Thu, 27 Jan 2011 01:38:57 +0000 (17:38 -0800)]
Merge "Import revised translations. DO NOT MERGE" into honeycomb
Wink Saville [Thu, 27 Jan 2011 01:32:10 +0000 (17:32 -0800)]
am
13a8f2a5: Merge "Comment out the isAvailable optimization." into honeycomb
* commit '
13a8f2a59c063b988502de9b7197d83b5db487d9':
Comment out the isAvailable optimization.
Wink Saville [Thu, 27 Jan 2011 01:29:32 +0000 (17:29 -0800)]
Merge "Comment out the isAvailable optimization." into honeycomb
Scott Main [Thu, 27 Jan 2011 01:09:21 +0000 (17:09 -0800)]
am
0f2e2b8b: Merge "Update package descriptions with editorial revisions. Notably, this removes exessive info about resources from the content package, because it\'s not a good location and the info is avilable in the dev guide, but also added some of the info to the R
* commit '
0f2e2b8b82c7b589bcc603ce57f8ff3d1c947784':
Update package descriptions with editorial revisions. Notably, this removes exessive info about resources from the content package, because it's not a good location and the info is avilable in the dev guide, but also added some of the info to the Resources class description.
Scott Main [Thu, 27 Jan 2011 01:06:45 +0000 (17:06 -0800)]
Merge "Update package descriptions with editorial revisions. Notably, this removes exessive info about resources from the content package, because it's not a good location and the info is avilable in the dev guide, but also added some of the info to the Resources class description." into honeycomb
Andreas Huber [Thu, 27 Jan 2011 00:58:04 +0000 (16:58 -0800)]
am
586096a9: (-s ours) am
2dce338e: DO NOT MERGE: This particular RTSP server streams MPEG4-LATM audio with extra trailing bytes.
* commit '
586096a9575a52ea7fa318f6f8540b47ba2ed2e8':
DO NOT MERGE: This particular RTSP server streams MPEG4-LATM audio with extra trailing bytes.
Jeff Brown [Thu, 27 Jan 2011 00:57:38 +0000 (16:57 -0800)]
am
91f2dbb7: (-s ours) am
7b448b8a: Merge "Move keymaps from sdk/emulator/keymaps."
* commit '
91f2dbb7825af8fbef1ce5db1f42d3171d7487ce':
Move keymaps from sdk/emulator/keymaps.
Xavier Ducrohet [Thu, 27 Jan 2011 00:54:31 +0000 (16:54 -0800)]
am
ee37ab8d: Merge "LayoutLib: properly erase the bitmap when rendering a new session." into honeycomb
* commit '
ee37ab8dce5fe60d9a2af411ae9e38e3e44589ed':
LayoutLib: properly erase the bitmap when rendering a new session.
Xavier Ducrohet [Thu, 27 Jan 2011 00:52:49 +0000 (16:52 -0800)]
Merge "LayoutLib: properly erase the bitmap when rendering a new session." into honeycomb
Andreas Huber [Thu, 27 Jan 2011 00:40:04 +0000 (16:40 -0800)]
am
2dce338e: DO NOT MERGE: This particular RTSP server streams MPEG4-LATM audio with extra trailing bytes.
* commit '
2dce338e01678620db0734fc3d84bcb3f2512d62':
DO NOT MERGE: This particular RTSP server streams MPEG4-LATM audio with extra trailing bytes.
Dianne Hackborn [Thu, 27 Jan 2011 00:30:54 +0000 (16:30 -0800)]
am
93257271: Merge "Remove xlarge specific icon size" into honeycomb
* commit '
93257271add728749a181e0580f2e71f3c4f129c':
Remove xlarge specific icon size
Dianne Hackborn [Thu, 27 Jan 2011 00:30:49 +0000 (16:30 -0800)]
am
8c0ac870: Merge "Fix another part of #
3387855: Menu flashes on left side of screen" into honeycomb
* commit '
8c0ac8708761872082c75aedc5fa4b25d1286fd0':
Fix another part of #
3387855: Menu flashes on left side of screen
Dianne Hackborn [Thu, 27 Jan 2011 00:28:46 +0000 (16:28 -0800)]
Merge "Remove xlarge specific icon size" into honeycomb
Dianne Hackborn [Thu, 27 Jan 2011 00:28:38 +0000 (16:28 -0800)]
am
2d63144e: Merge "Fix issue #
3380072: Switching in and out of gmail not preserving position in label" into honeycomb
* commit '
2d63144ed94dff0832d051ec355f56649244dd4e':
Fix issue #
3380072: Switching in and out of gmail not preserving position in label
Dianne Hackborn [Thu, 27 Jan 2011 00:27:40 +0000 (16:27 -0800)]
Merge "Fix another part of #
3387855: Menu flashes on left side of screen" into honeycomb
Mike Lockwood [Thu, 27 Jan 2011 00:26:26 +0000 (16:26 -0800)]
am
278a04eb: Merge "Fix javadoc for MediaStore.Files.FileColumns constants" into honeycomb
* commit '
278a04eb7a56459c2f9e3b47dcced6522a87f1d1':
Fix javadoc for MediaStore.Files.FileColumns constants
Dianne Hackborn [Thu, 27 Jan 2011 00:25:49 +0000 (16:25 -0800)]
Merge "Fix issue #
3380072: Switching in and out of gmail not preserving position in label" into honeycomb
Mike Lockwood [Thu, 27 Jan 2011 00:24:19 +0000 (16:24 -0800)]
Merge "Fix javadoc for MediaStore.Files.FileColumns constants" into honeycomb
Winson Chung [Thu, 27 Jan 2011 00:14:03 +0000 (16:14 -0800)]
am
b90a91c6: Making requested indices the last to be pruned when we hit cache memory limits. (
3368863)
* commit '
b90a91c633e99d4559095184af27d1416541d3c0':
Making requested indices the last to be pruned when we hit cache memory limits. (
3368863)
Andreas Huber [Wed, 26 Jan 2011 23:52:48 +0000 (15:52 -0800)]
am
63b38e31: Merge "This particular RTSP server streams MPEG4-LATM audio with extra trailing bytes." into honeycomb
* commit '
63b38e31aaea5a3e75c7bbe0c9e40e8bdb78ff73':
This particular RTSP server streams MPEG4-LATM audio with extra trailing bytes.
Jim Miller [Wed, 26 Jan 2011 23:50:41 +0000 (15:50 -0800)]
am
85433c76: Merge "Fix
3354590: Add back button to dismiss RecentAppsPanel" into honeycomb
* commit '
85433c76066843d20c92c90d64e842e4f14dbac8':
Fix
3354590: Add back button to dismiss RecentAppsPanel
Andreas Huber [Wed, 26 Jan 2011 23:50:04 +0000 (15:50 -0800)]
Merge "This particular RTSP server streams MPEG4-LATM audio with extra trailing bytes." into honeycomb
Jim Miller [Wed, 26 Jan 2011 23:47:40 +0000 (15:47 -0800)]
Merge "Fix
3354590: Add back button to dismiss RecentAppsPanel" into honeycomb
Romain Guy [Wed, 26 Jan 2011 23:43:09 +0000 (15:43 -0800)]
am
9e7c2c6d: Merge "Optimize invalidate() calls." into honeycomb
* commit '
9e7c2c6ded1144122915cfb8bd663e789c7eb93b':
Optimize invalidate() calls.
Fabrice Di Meglio [Wed, 26 Jan 2011 23:42:55 +0000 (15:42 -0800)]
am
f728411b: Merge "Fix bug #
3395355 ("adb shell dumpsys content" should present human readable failure messages instead of error codes)" into honeycomb
* commit '
f728411ba40d71a40a0cb0dbfcaa44764af17692':
Fix bug #
3395355 ("adb shell dumpsys content" should present human readable failure messages instead of error codes)
Romain Guy [Wed, 26 Jan 2011 23:40:16 +0000 (15:40 -0800)]
Merge "Optimize invalidate() calls." into honeycomb
Fabrice Di Meglio [Wed, 26 Jan 2011 23:39:24 +0000 (15:39 -0800)]
Merge "Fix bug #
3395355 ("adb shell dumpsys content" should present human readable failure messages instead of error codes)" into honeycomb
Jason Chen [Wed, 26 Jan 2011 23:34:18 +0000 (15:34 -0800)]
am
b61440b4: Merge "Cherry-pick of
f5e4f208b9ed73 to honeycomb" into honeycomb
* commit '
b61440b440ab6cd89ea1462121302f0c4896a109':
Cherry-pick of
f5e4f208b9ed73 to honeycomb
Mike Lockwood [Wed, 26 Jan 2011 23:32:11 +0000 (15:32 -0800)]
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
Jason Chen [Wed, 26 Jan 2011 23:30:56 +0000 (15:30 -0800)]
Merge "Cherry-pick of
f5e4f208b9ed73 to honeycomb" into honeycomb
Mike Lockwood [Wed, 26 Jan 2011 23:30:07 +0000 (15:30 -0800)]
Merge "MTP: Fix month off by one error in date parsing and formatting code" into honeycomb
Jeff Brown [Wed, 26 Jan 2011 23:03:32 +0000 (15:03 -0800)]
am
7b448b8a: Merge "Move keymaps from sdk/emulator/keymaps."
* commit '
7b448b8a6c1ababc3a3e4553ebe9bac7473051c8':
Move keymaps from sdk/emulator/keymaps.
Shih-wei Liao [Wed, 26 Jan 2011 22:58:57 +0000 (14:58 -0800)]
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.
Shih-wei Liao [Wed, 26 Jan 2011 22:56:41 +0000 (14:56 -0800)]
Merge "Part II of fixing b/
2943524: On-device linking rs_core." into honeycomb
John Wang [Wed, 26 Jan 2011 22:48:34 +0000 (14:48 -0800)]
am
7b4ba9d8: Merge "Enable recovery in RIL wakelock release check." into honeycomb
* commit '
7b4ba9d80d2cdde310c29d01d0e22c7815d84261':
Enable recovery in RIL wakelock release check.
James Dong [Wed, 26 Jan 2011 22:45:41 +0000 (14:45 -0800)]
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.
John Wang [Wed, 26 Jan 2011 22:45:24 +0000 (14:45 -0800)]
Merge "Enable recovery in RIL wakelock release check." into honeycomb
James Dong [Wed, 26 Jan 2011 22:43:59 +0000 (14:43 -0800)]
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
Svetoslav Ganov [Wed, 26 Jan 2011 22:41:33 +0000 (14:41 -0800)]
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.
Svetoslav Ganov [Wed, 26 Jan 2011 22:39:47 +0000 (14:39 -0800)]
Merge "Final polish of WebView accessibility support for no JavaScript case." into honeycomb
Jeff Brown [Wed, 26 Jan 2011 22:25:08 +0000 (14:25 -0800)]
Merge "Move keymaps from sdk/emulator/keymaps."
Dianne Hackborn [Wed, 26 Jan 2011 22:15:08 +0000 (14:15 -0800)]
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.
Jean-Michel Trivi [Wed, 26 Jan 2011 22:12:45 +0000 (14:12 -0800)]
am
1155efdc: (-s ours) am
2ba92c71: do not merge bug
3370834 Cherrypick from master
* commit '
1155efdc715413cd7a881e5226b5f5f0b2db8f71':
do not merge bug
3370834 Cherrypick from master
Stephen Hines [Wed, 26 Jan 2011 22:10:58 +0000 (14:10 -0800)]
am
8fc7690f: Merge "Hook up tgammaf properly for RS." into honeycomb
* commit '
8fc7690f2b42c27f9f609647b96c17234aa9d78e':
Hook up tgammaf properly for RS.
Stephen Hines [Wed, 26 Jan 2011 22:08:49 +0000 (14:08 -0800)]
Merge "Hook up tgammaf properly for RS." into honeycomb
Dianne Hackborn [Wed, 26 Jan 2011 22:08:30 +0000 (14:08 -0800)]
am
1d07b5bc: Merge "Make CHANGE_COMPONENT_ENABLED_STATE a signatureOrSystem perm." into gingerbread
* commit '
1d07b5bc9b0a9e3de4495834242548a600cae1d8':
Make CHANGE_COMPONENT_ENABLED_STATE a signatureOrSystem perm.
Jean-Michel Trivi [Wed, 26 Jan 2011 22:05:18 +0000 (14:05 -0800)]
am
2ba92c71: do not merge bug
3370834 Cherrypick from master
* commit '
2ba92c71b5684dce700cf848bf157153c156df1d':
do not merge bug
3370834 Cherrypick from master
OSDN Git Service
