OSDN Git Service
Joe Onorato [Sun, 30 Jan 2011 21:19:57 +0000 (13:19 -0800)]
am
f2057d90: Merge changes I09e8c4eb,I91a0e05f into honeycomb
* commit '
f2057d907b5d9c75086337e840f70b5061b2a5aa':
Use a DateFormat that fits.
Update the network info when the configuration changes.
Joe Onorato [Sun, 30 Jan 2011 21:18:16 +0000 (13:18 -0800)]
Merge changes I09e8c4eb,I91a0e05f into honeycomb
* changes:
Use a DateFormat that fits.
Update the network info when the configuration changes.
The Android Open Source Project [Sun, 30 Jan 2011 20:40:39 +0000 (12:40 -0800)]
Reconcile gingerbread-plus-aosp and honeycomb
Change-Id: I7ca5acfee971105e3f3d6a674f82da0e890b0434
The Android Open Source Project [Sun, 30 Jan 2011 20:40:32 +0000 (12:40 -0800)]
Mass merge from gingerbread - do not merge
Change-Id: I45dc3596bf4211d8f91c64f2d1d00588878df629
Jeff Brown [Sun, 30 Jan 2011 20:10:07 +0000 (12:10 -0800)]
am
3c89f6d1: Merge "Add "Use physical keyboard" option to system bar IME button." into honeycomb
* commit '
3c89f6d1bd0821d0ae0205a5b48176156735aaac':
Add "Use physical keyboard" option to system bar IME button.
Jeff Brown [Sun, 30 Jan 2011 20:07:49 +0000 (12:07 -0800)]
Merge "Add "Use physical keyboard" option to system bar IME button." into honeycomb
Dianne Hackborn [Sun, 30 Jan 2011 19:02:29 +0000 (11:02 -0800)]
am
e97a12e3: Fix screen size compatibility mode.
* commit '
e97a12e340dfdc246b531dfb49596628bd24e81b':
Fix screen size compatibility mode.
Joe Malin [Sun, 30 Jan 2011 17:48:49 +0000 (09:48 -0800)]
am
51990f9b: Merge "sdk doc change: Copy/Paste/Drag/Drop" into honeycomb
* commit '
51990f9b0c7c0a22e1a3440c620ab97ebe4209c9':
sdk doc change: Copy/Paste/Drag/Drop
Joe Malin [Sun, 30 Jan 2011 17:45:59 +0000 (09:45 -0800)]
Merge "sdk doc change: Copy/Paste/Drag/Drop" into honeycomb
Dianne Hackborn [Sun, 30 Jan 2011 07:07:48 +0000 (23:07 -0800)]
am
a1f5e82f: am
a30063d8: am
25eb0464: Merge "Normalize output from aapt d"
* commit '
a1f5e82f37c77af7b1d630b5bca715d1742f1234':
Normalize output from aapt d
Dianne Hackborn [Sun, 30 Jan 2011 07:04:50 +0000 (23:04 -0800)]
am
a30063d8: am
25eb0464: Merge "Normalize output from aapt d"
* commit '
a30063d80c08434ac3c7316f338c6d54110449ab':
Normalize output from aapt d
Dianne Hackborn [Sun, 30 Jan 2011 07:01:20 +0000 (23:01 -0800)]
am
25eb0464: Merge "Normalize output from aapt d"
* commit '
25eb04642cb5a72f59a274bbfc92f4f65c6c343e':
Normalize output from aapt d
Dianne Hackborn [Sun, 30 Jan 2011 06:53:20 +0000 (22:53 -0800)]
Merge "Normalize output from aapt d"
Daniel Sandler [Sun, 30 Jan 2011 06:39:07 +0000 (22:39 -0800)]
am
eec20286: Merge "Fix broken intitial notification panel animation." into honeycomb
* commit '
eec2028698cfb80734cd03356d81671f8be31c66':
Fix broken intitial notification panel animation.
Daniel Sandler [Sun, 30 Jan 2011 06:37:13 +0000 (22:37 -0800)]
Merge "Fix broken intitial notification panel animation." into honeycomb
Dianne Hackborn [Sun, 30 Jan 2011 06:35:42 +0000 (22:35 -0800)]
am
71bb59f9: (-s ours) am
c12cdda9: Merge "DO NOT MERGE: Fix screen size compatibility mode." into gingerbread
* commit '
71bb59f9e6799083830077dbb7e0f1effdd3faf7':
DO NOT MERGE: Fix screen size compatibility mode.
Dianne Hackborn [Sun, 30 Jan 2011 06:30:57 +0000 (22:30 -0800)]
am
c12cdda9: Merge "DO NOT MERGE: Fix screen size compatibility mode." into gingerbread
* commit '
c12cdda949e6b916dd9e6fa4b30ab8b0d1898faa':
DO NOT MERGE: Fix screen size compatibility mode.
Dianne Hackborn [Sun, 30 Jan 2011 06:27:16 +0000 (22:27 -0800)]
am
c12cdda9: (-s ours) Merge "DO NOT MERGE: Fix screen size compatibility mode." into gingerbread
* commit '
c12cdda949e6b916dd9e6fa4b30ab8b0d1898faa':
DO NOT MERGE: Fix screen size compatibility mode.
Dianne Hackborn [Sun, 30 Jan 2011 06:20:05 +0000 (22:20 -0800)]
Merge "DO NOT MERGE: Fix screen size compatibility mode." into gingerbread
Ken Wakasa [Sun, 30 Jan 2011 05:42:30 +0000 (21:42 -0800)]
am
8710e76a: Follow up change to I741642ac
* commit '
8710e76a897cd546a79ee4338a4147eeb9f3e068':
Follow up change to I741642ac
Dianne Hackborn [Sat, 29 Jan 2011 23:08:07 +0000 (15:08 -0800)]
am
e802b592: am
2107757d: am
bbb5a5ce: Merge "Make AaptGroupEntry::getMncName accept mnc00"
* commit '
e802b59280540ce24ea1db61907a0f1f22f01fad':
Make AaptGroupEntry::getMncName accept mnc00
Dianne Hackborn [Sat, 29 Jan 2011 23:05:30 +0000 (15:05 -0800)]
am
2107757d: am
bbb5a5ce: Merge "Make AaptGroupEntry::getMncName accept mnc00"
* commit '
2107757dde0b3159119edcc9084fcb9a87985e88':
Make AaptGroupEntry::getMncName accept mnc00
Dianne Hackborn [Sat, 29 Jan 2011 22:59:02 +0000 (14:59 -0800)]
am
bbb5a5ce: Merge "Make AaptGroupEntry::getMncName accept mnc00"
* commit '
bbb5a5ce1922a168335811b177cd7341350c15cc':
Make AaptGroupEntry::getMncName accept mnc00
Jean-Baptiste Queru [Sat, 29 Jan 2011 22:51:17 +0000 (14:51 -0800)]
Merge
3100207b from gingerbread-plus-aosp
Change-Id: Ib2eaede8b9e400e1d273f981c08a6ef82f3dd588
Jean-Baptiste Queru [Sat, 29 Jan 2011 22:43:33 +0000 (14:43 -0800)]
am
1358b6a4: Tweak to make merges easier
* commit '
1358b6a4fb68e81058aa938e46b125350bdf0fff':
Tweak to make merges easier
Dianne Hackborn [Sat, 29 Jan 2011 22:38:48 +0000 (14:38 -0800)]
Merge "Make AaptGroupEntry::getMncName accept mnc00"
Jean-Baptiste Queru [Sat, 29 Jan 2011 22:32:04 +0000 (14:32 -0800)]
am
1358b6a4: Tweak to make merges easier
* commit '
1358b6a4fb68e81058aa938e46b125350bdf0fff':
Tweak to make merges easier
Jean-Baptiste Queru [Sat, 29 Jan 2011 20:59:11 +0000 (12:59 -0800)]
Merge
6b739dc7 from gingerbread
Change-Id: If94889da67977aff7daa1e201c10cd51b7e2fff8
Jason parks [Sat, 29 Jan 2011 20:04:11 +0000 (12:04 -0800)]
am
a2e765ef: Merge "Update the encryption password when the device password is changed." into honeycomb
* commit '
a2e765ef1ad2cb907a4ae0a93bb15e4764ebb59a':
Update the encryption password when the device password is changed.
Jason parks [Sat, 29 Jan 2011 20:02:19 +0000 (12:02 -0800)]
Merge "Update the encryption password when the device password is changed." into honeycomb
Eric Fischer [Sat, 29 Jan 2011 19:25:30 +0000 (11:25 -0800)]
am
5f2def8c: (-s ours) Merge "Import revised translations. DO NOT MERGE" into gingerbread
* commit '
5f2def8cfdad2491a646be69347444a3be6ddf84':
Import revised translations. DO NOT MERGE
Dirk Dougherty [Sat, 29 Jan 2011 19:16:13 +0000 (11:16 -0800)]
am
fa809dba: Merge "Doc change: Add time-lapse video to 3.0 highlights." into gingerbread
* commit '
fa809dba8ec7f894bd53dba8e1cf742082c5cb3e':
Doc change: Add time-lapse video to 3.0 highlights.
Andreas Huber [Sat, 29 Jan 2011 19:16:07 +0000 (11:16 -0800)]
am
b6c2e2b4: (-s ours) DO NOT MERGE: More robust parsing of NPT time ranges in RTSP.
* commit '
b6c2e2b46c574a90450438cccfb6cb97b7edc20f':
DO NOT MERGE: More robust parsing of NPT time ranges in RTSP.
Jean-Baptiste Queru [Sat, 29 Jan 2011 19:03:55 +0000 (11:03 -0800)]
Merge
0ef57993 from gingerbread
Change-Id: If10fee1ae387a8130356dd62fe678495402d5edf
Jim Miller [Sat, 29 Jan 2011 19:00:28 +0000 (11:00 -0800)]
am
226e5756: (-s ours) Merge "Fix
3391330: Use BATTERY_STATUS_FULL as "Charged" state [DO NOT MERGE]" into gingerbread
* commit '
226e57563c3110aa688fc41f10b7a96cd21b6231':
Fix
3391330: Use BATTERY_STATUS_FULL as "Charged" state [DO NOT MERGE]
Jean-Baptiste Queru [Sat, 29 Jan 2011 18:57:48 +0000 (10:57 -0800)]
Merge
d350dc04 from gingerbread
Change-Id: Ieb76b9724a3e253f9614d02cc06d3348b8e2c929
Eric Fischer [Sat, 29 Jan 2011 18:40:17 +0000 (10:40 -0800)]
am
3d73c4d3: (-s ours) Merge "Import revised translations. DO NOT MERGE" into gingerbread
* commit '
3d73c4d386e5ae66aa5c472342207728ab4fbf3a':
Import revised translations. DO NOT MERGE
Nick Pelly [Sat, 29 Jan 2011 18:40:07 +0000 (10:40 -0800)]
am
21d0a173: Fix build - javadoc.
* commit '
21d0a173f138563e2eaba286b0eb505f987918a9':
Fix build - javadoc.
Scott Main [Sat, 29 Jan 2011 18:40:01 +0000 (10:40 -0800)]
am
7a9741ca: Merge "cherry pick Change-Id: I82981801475dc1be766d59e0e384c856bdf59d6d revise info about emulator snapshots to indicate it\'s not final" into gingerbread
* commit '
7a9741caca3ec0f6f3fd95426f2bd03b45b57758':
cherry pick Change-Id: I82981801475dc1be766d59e0e384c856bdf59d6d revise info about emulator snapshots to indicate it's not final
Jean-Baptiste Queru [Sat, 29 Jan 2011 18:38:09 +0000 (10:38 -0800)]
Merge
eab0e97b from gingerbread
Change-Id: Ibbe49137775b58ba0961fadd945c05acfcd1ce61
Robert Greenwalt [Sat, 29 Jan 2011 18:26:33 +0000 (10:26 -0800)]
am
89a54408: (-s ours) Merge "Update networktype before sending state change." into gingerbread
* commit '
89a544088fcfa849be0d8824a2ac0a545950847b':
Update networktype before sending state change.
Dirk Dougherty [Sat, 29 Jan 2011 18:16:14 +0000 (10:16 -0800)]
am
591a5f86: Doc change: fix adt archive filename.
* commit '
591a5f86bd4b3f1732b935daad909e4e63149f01':
Doc change: fix adt archive filename.
Jean-Baptiste Queru [Sat, 29 Jan 2011 18:10:02 +0000 (10:10 -0800)]
Merge
ba3dd323 from gingerbread
Change-Id: I615bf5177abbc680292e0116491da58835c7396f
Scott Main [Sat, 29 Jan 2011 17:59:33 +0000 (09:59 -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
Andreas Huber [Sat, 29 Jan 2011 17:55:13 +0000 (09:55 -0800)]
am
2dce338e: (-s ours) 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 [Sat, 29 Jan 2011 17:54:53 +0000 (09:54 -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 [Sat, 29 Jan 2011 17:54:41 +0000 (09:54 -0800)]
am
2ba92c71: (-s ours) do not merge bug
3370834 Cherrypick from master
* commit '
2ba92c71b5684dce700cf848bf157153c156df1d':
do not merge bug
3370834 Cherrypick from master
satok [Sat, 29 Jan 2011 17:50:03 +0000 (09:50 -0800)]
am
e40dea0d: Fix a bug that IME switch disappiers at switching IME subtype.
* commit '
e40dea0d06ec1c04db80191fd2965363b4fac781':
Fix a bug that IME switch disappiers at switching IME subtype.
Kenny Root [Sat, 29 Jan 2011 17:48:07 +0000 (09:48 -0800)]
am
138757db: Merge "Make OBB results a one-way call" into gingerbread
* commit '
138757db4f19cb626ef5c1d371d4fca004304a08':
Make OBB results a one-way call
Jean-Baptiste Queru [Sat, 29 Jan 2011 17:45:41 +0000 (09:45 -0800)]
Merge
c33acae9 from gingerbread
Change-Id: I52b5045cbef6e4927f86830498050977b2829859
Mathias Agopian [Sat, 29 Jan 2011 17:40:51 +0000 (09:40 -0800)]
am
239fd805: (-s ours) Merge "fix [
3361121] hang in glClear() - device unresponsive, OTA fails (DO NOT MERGE)" into gingerbread
* commit '
239fd805ef7c0e4116b0a89e20caaf287e91f017':
fix [
3361121] hang in glClear() - device unresponsive, OTA fails (DO NOT MERGE)
Mathias Agopian [Sat, 29 Jan 2011 17:40:34 +0000 (09:40 -0800)]
am
1955a5c9: (-s ours) Merge "partially fix [
3306150] HTML5 video with H/W acceleration blackout (DO NOT MERGE)" into gingerbread
* commit '
1955a5c9da421dc89bb1a1dd3d3193159192cde9':
partially fix [
3306150] HTML5 video with H/W acceleration blackout (DO NOT MERGE)
Mathias Agopian [Sat, 29 Jan 2011 17:40:25 +0000 (09:40 -0800)]
am
d0441f92: (-s ours) Merge "fix a small bug that caused screenshot to show garbage in some cases (DO NOT MERGE)" into gingerbread
* commit '
d0441f921b2b1879fb44041f521d9bfaa5a547d0':
fix a small bug that caused screenshot to show garbage in some cases (DO NOT MERGE)
Mathias Agopian [Sat, 29 Jan 2011 17:40:14 +0000 (09:40 -0800)]
am
043a3cdd: (-s ours) Merge "workaround [
3201922] display not on: log full of gralloc errors (DO NOT MERGE)" into gingerbread
* commit '
043a3cddf67e2baf38711bcb125084599f8f9802':
workaround [
3201922] display not on: log full of gralloc errors (DO NOT MERGE)
Mathias Agopian [Sat, 29 Jan 2011 17:40:06 +0000 (09:40 -0800)]
am
d3fcd0a1: (-s ours) Merge "minor clean-up. SurfaceFlinger doesn\'t need libpixelflinger.so. (DO NOT MERGE)" into gingerbread
* commit '
d3fcd0a1c923498921107bb44fbc8b24582a170a':
minor clean-up. SurfaceFlinger doesn't need libpixelflinger.so. (DO NOT MERGE)
Jean-Baptiste Queru [Sat, 29 Jan 2011 17:37:44 +0000 (09:37 -0800)]
Merge
f126ad3b from gingerbread
Change-Id: I13a79033239d306fcf9291ca7fad7445f2cd1f47
Jean-Baptiste Queru [Sat, 29 Jan 2011 17:36:02 +0000 (09:36 -0800)]
am
34ebb5bf: (-s ours) am
87d19759: Delete browerplugin tests - do not merge
* commit '
34ebb5bfec0794d5852b47edaa8b9d4cea22e515':
Delete browerplugin tests - do not merge
Jean-Baptiste Queru [Sat, 29 Jan 2011 17:35:55 +0000 (09:35 -0800)]
am
88d7300d: (-s ours) am
d4c8cec0: am
9720323a: (-s ours) Merge "Delete browerplugin tests - do not merge"
* commit '
88d7300d2abaf638c2c0b5505b657b401f881c14':
Delete browerplugin tests - do not merge
Marco Nelissen [Sat, 29 Jan 2011 17:32:05 +0000 (09:32 -0800)]
am
c929677e: Merge "Increase the number of useful bits in the spectrum." into gingerbread
* commit '
c929677e017759047d94599faa1b80ebe278fefb':
Increase the number of useful bits in the spectrum.
Robert Greenwalt [Sat, 29 Jan 2011 17:32:04 +0000 (09:32 -0800)]
resolved conflicts for merge of
aa3866e6 to honeycomb-plus-aosp
Change-Id: I7a3445f7df2a66c70f630fa63ceb4ae150d70963
Nick Pelly [Sat, 29 Jan 2011 17:31:56 +0000 (09:31 -0800)]
am
b134223f: Make Mifare Classic increment/decrement operands little endian
* commit '
b134223f91c8801d577cb72e92a37cb65fec717a':
Make Mifare Classic increment/decrement operands little endian
Hung-ying Tyan [Sat, 29 Jan 2011 17:31:40 +0000 (09:31 -0800)]
am
cc019c0c: Merge "Get mute state from active call." into gingerbread
* commit '
cc019c0caa0dd984404dea4d6623ae9d7b8474f1':
Get mute state from active call.
Hung-ying Tyan [Sat, 29 Jan 2011 17:31:19 +0000 (09:31 -0800)]
am
14b6d062: Merge changes Ib70e0cf2,I0691cd70 into gingerbread
* commit '
14b6d0620b42d1bb3a55778ba452d838a0d89223':
SipService: registers broadcast receivers on demand.
SipService: release wake lock for cancelled tasks.
Jeff Brown [Sat, 29 Jan 2011 17:27:55 +0000 (09:27 -0800)]
am
d8bdc06f: (-s ours) Fix SENSOR_LANDSCAPE and SENSOR_PORTRAIT (DO NOT MERGE)
* commit '
d8bdc06f8139231f1edc1a8bf22b637ebb790605':
Fix SENSOR_LANDSCAPE and SENSOR_PORTRAIT (DO NOT MERGE)
Eric Fischer [Sat, 29 Jan 2011 17:13:21 +0000 (09:13 -0800)]
am
287fbba5: (-s ours) am
5f2def8c: Merge "Import revised translations. DO NOT MERGE" into gingerbread
* commit '
287fbba5b88cfba1e55fd98979ebe83b4b8ed8f4':
Import revised translations. DO NOT MERGE
Dirk Dougherty [Sat, 29 Jan 2011 16:57:25 +0000 (08:57 -0800)]
am
30a85ec7: am
fa809dba: Merge "Doc change: Add time-lapse video to 3.0 highlights." into gingerbread
* commit '
30a85ec7e8d79448fbd0d0af3ac25b656f8428c4':
Doc change: Add time-lapse video to 3.0 highlights.
Andreas Huber [Sat, 29 Jan 2011 16:57:21 +0000 (08:57 -0800)]
am
70888c00: (-s ours) am
b6c2e2b4: DO NOT MERGE: More robust parsing of NPT time ranges in RTSP.
* commit '
70888c00a0371692a07132f0dd94208456dd44c1':
DO NOT MERGE: More robust parsing of NPT time ranges in RTSP.
Jean-Baptiste Queru [Sat, 29 Jan 2011 16:54:06 +0000 (08:54 -0800)]
Merge
13212f83 from gingerbread-plus-aosp
Change-Id: I9a8ee0c7e7896aea85e7a7c18ee82927091cb670
Jim Miller [Sat, 29 Jan 2011 16:47:55 +0000 (08:47 -0800)]
am
145643ca: (-s ours) am
226e5756: Merge "Fix
3391330: Use BATTERY_STATUS_FULL as "Charged" state [DO NOT MERGE]" into gingerbread
* commit '
145643ca4bb98a88977026ea4d7866e391d53dce':
Fix
3391330: Use BATTERY_STATUS_FULL as "Charged" state [DO NOT MERGE]
Jean-Baptiste Queru [Sat, 29 Jan 2011 16:45:29 +0000 (08:45 -0800)]
Merge
34afc2cd from gingerbread-plus-aosp
Change-Id: I2471571af1d8e34e7270cb6f765f16b4a474bb28
Eric Fischer [Sat, 29 Jan 2011 16:02:19 +0000 (08:02 -0800)]
am
e49e30cc: (-s ours) am
3d73c4d3: Merge "Import revised translations. DO NOT MERGE" into gingerbread
* commit '
e49e30cc4d9411326735f15d92e8d7455467072f':
Import revised translations. DO NOT MERGE
Nick Pelly [Sat, 29 Jan 2011 16:02:04 +0000 (08:02 -0800)]
am
32f7d50d: am
21d0a173: Fix build - javadoc.
* commit '
32f7d50df147e4eb171044aad376bd1425fcf5e7':
Fix build - javadoc.
Jean-Baptiste Queru [Sat, 29 Jan 2011 16:00:52 +0000 (08:00 -0800)]
am
87d19759: Delete browerplugin tests - do not merge
* commit '
87d197597c9130b10ba9d67f17ed81db26e35cd8':
Delete browerplugin tests - do not merge
Scott Main [Sat, 29 Jan 2011 15:59:28 +0000 (07:59 -0800)]
am
51330184: am
7a9741ca: Merge "cherry pick Change-Id: I82981801475dc1be766d59e0e384c856bdf59d6d revise info about emulator snapshots to indicate it\'s not final" into gingerbread
* commit '
51330184feb1b8d01ac48f4f13e4b91e7e334401':
cherry pick Change-Id: I82981801475dc1be766d59e0e384c856bdf59d6d revise info about emulator snapshots to indicate it's not final
Jean-Baptiste Queru [Sat, 29 Jan 2011 15:58:36 +0000 (07:58 -0800)]
am
d4c8cec0: am
9720323a: (-s ours) Merge "Delete browerplugin tests - do not merge"
* commit '
d4c8cec094dbf7bcfa3f31bedae15e5c65b13e94':
Delete browerplugin tests - do not merge
Jean-Baptiste Queru [Sat, 29 Jan 2011 15:39:47 +0000 (07:39 -0800)]
am
9720323a: (-s ours) Merge "Delete browerplugin tests - do not merge"
* commit '
9720323a5138acafbe30da38d61eeac469b675a4':
Delete browerplugin tests - do not merge
Jean-Baptiste Queru [Sat, 29 Jan 2011 15:32:39 +0000 (07:32 -0800)]
Merge
55e124c4 from gingerbread-plus-aosp
Change-Id: I8b428792ced31b73e8cc3743ab38e157578e9377
Andreas Huber [Sat, 29 Jan 2011 15:30:57 +0000 (07:30 -0800)]
am
efebdf4b: (-s ours) DO NOT MERGE: Support non-multiple-of-16 dimensions in MPEG4/H.263 software decoder
* commit '
efebdf4bd4da35bc50c7d81450c8473697f6654a':
DO NOT MERGE: Support non-multiple-of-16 dimensions in MPEG4/H.263 software decoder
Justin Ho [Sat, 29 Jan 2011 15:30:39 +0000 (07:30 -0800)]
am
28c4f69a: Updated checkbox assets
* commit '
28c4f69a938766076c14e8f5b07951ec2a9f610d':
Updated checkbox assets
Arnaud Ferir [Sat, 29 Jan 2011 15:30:07 +0000 (07:30 -0800)]
am
5e81a6e2: Fix trace mismatch.
* commit '
5e81a6e21e9977acd9dfafaf030bf51c8572a98f':
Fix trace mismatch.
Sylvain Fonteneau [Sat, 29 Jan 2011 15:29:56 +0000 (07:29 -0800)]
am
c5a418ec: Handle mock tags in android.nfc.Tag conversion to Parcel.
* commit '
c5a418ecb7681159ae6674a4d91177c6841537b1':
Handle mock tags in android.nfc.Tag conversion to Parcel.
John Wang [Sat, 29 Jan 2011 15:29:42 +0000 (07:29 -0800)]
am
93300ce2: Merge "Enable recovery in RIL wakelock release check." into gingerbread
* commit '
93300ce2d398195d5616a2e924eb4a785274538e':
Enable recovery in RIL wakelock release check.
Jean-Baptiste Queru [Sat, 29 Jan 2011 15:27:06 +0000 (07:27 -0800)]
Merge
c896d85c from gingerbread
Change-Id: Ib739e79187ec95fdbb88f90f3d03fafd4a1f721a
Jean-Baptiste Queru [Sat, 29 Jan 2011 15:17:22 +0000 (07:17 -0800)]
Merge
da01b4ab from gingerbread
Change-Id: I644f170fe18042ffb09b9b852321f68c651c7972
Jeff Hamilton [Sat, 29 Jan 2011 15:09:21 +0000 (07:09 -0800)]
am
e1e70c57: Merge "Allow null filters for foreground dispatch to act as catch all." into gingerbread
* commit '
e1e70c57613956dff0f14829f6385e26c323b609':
Allow null filters for foreground dispatch to act as catch all.
Jim Miller [Sat, 29 Jan 2011 15:08:58 +0000 (07:08 -0800)]
am
42a46157: Fix
3379239: Catch exceptions from workaround for OOM.
* commit '
42a461570b9c5502959e429c4f16ca5ca860c4f2':
Fix
3379239: Catch exceptions from workaround for OOM.
Robert Greenwalt [Sat, 29 Jan 2011 14:55:38 +0000 (06:55 -0800)]
am
6b739dc7: Merge "Add some network types that OEM\'s are asking for." into gingerbread
* commit '
6b739dc7292452227cdd8abd90658f4db8f0ce70':
Add some network types that OEM's are asking for.
Robert Greenwalt [Sat, 29 Jan 2011 14:44:35 +0000 (06:44 -0800)]
am
19eecb02: Merge "Don\'t use mobile networktype icon if not connected" into honeycomb
* commit '
19eecb028fe094e5f41d9ddeb1e6aac1d096da43':
Don't use mobile networktype icon if not connected
Robert Greenwalt [Sat, 29 Jan 2011 14:38:35 +0000 (06:38 -0800)]
Merge "Add some network types that OEM's are asking for." into gingerbread
Robert Greenwalt [Sat, 29 Jan 2011 14:35:57 +0000 (06:35 -0800)]
Merge "Don't use mobile networktype icon if not connected" into honeycomb
Justin Ho [Sat, 29 Jan 2011 06:54:11 +0000 (22:54 -0800)]
am
9b1df164: Merge "Merging Honeycomb style ic_menu that are background safe, refreshed with Holo style" into honeycomb
* commit '
9b1df1646ff4d480eebe2fd9cd394915b7925e92':
Merging Honeycomb style ic_menu that are background safe, refreshed with Holo style
Justin Ho [Sat, 29 Jan 2011 06:51:51 +0000 (22:51 -0800)]
Merge "Merging Honeycomb style ic_menu that are background safe, refreshed with Holo style" into honeycomb
Justin Ho [Sat, 29 Jan 2011 03:21:33 +0000 (19:21 -0800)]
am
9371f703: Merge "New honeycomb sound set" into honeycomb
* commit '
9371f7030011da2bcc45587e59a40a498f92dfb4':
New honeycomb sound set
Justin Ho [Sat, 29 Jan 2011 03:18:51 +0000 (19:18 -0800)]
Merge "New honeycomb sound set" into honeycomb
Joe Onorato [Sat, 29 Jan 2011 02:50:03 +0000 (18:50 -0800)]
am
a0f2cdb5: Merge "999" into honeycomb
* commit '
a0f2cdb50720b0a1960e5342b376867b2c9ad1df':
999
Joe Onorato [Sat, 29 Jan 2011 02:47:57 +0000 (18:47 -0800)]
Merge "999" into honeycomb
Jaikumar Ganesh [Sat, 29 Jan 2011 02:45:14 +0000 (18:45 -0800)]
am
1c9761e3: (-s ours) Merge "Do Not Merge Connect other profiles when priority is auto connect." into gingerbread
* commit '
1c9761e30d6eccfe104928cdc961ed1d3a5e2f6b':
Do Not Merge Connect other profiles when priority is auto connect.
John Reck [Sat, 29 Jan 2011 02:44:57 +0000 (18:44 -0800)]
am
398a589c: (-s ours) Merge "DO NOT MERGE - Create db path if it doesn\'t exit" into gingerbread
* commit '
398a589ccea744556732b25097412dbb22c51271':
DO NOT MERGE - Create db path if it doesn't exit
Jeff Hamilton [Sat, 29 Jan 2011 02:41:42 +0000 (20:41 -0600)]
resolved conflicts for merge of
dc54a8c7 to honeycomb-merge
Change-Id: Ie23b05102fc69de31537822ded3f77d398e486f8
Mathias Agopian [Sat, 29 Jan 2011 02:40:44 +0000 (18:40 -0800)]
am
231da079: Merge "fix [
3389263] OMX.Nvidia.h264.decode fails to shutdown" into honeycomb
* commit '
231da079c93664fa7d81c7e957990f17a6334b17':
fix [
3389263] OMX.Nvidia.h264.decode fails to shutdown