OSDN Git Service
The Android Open Source Project [Tue, 13 Dec 2011 13:11:43 +0000 (05:11 -0800)]
Reconcile with ics-mr1-release
Change-Id: I96fd9c00680c7ff0e5c9fba04f8c08a31cf1cfa8
The Android Automerger [Tue, 13 Dec 2011 06:08:59 +0000 (22:08 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Jeff Sharkey [Tue, 13 Dec 2011 04:21:34 +0000 (20:21 -0800)]
am
f0bbc494: Merge "Avoid NPE when missing network stats." into ics-mr1
* commit '
f0bbc494d638f4c77e688bf9410027f453301559':
Avoid NPE when missing network stats.
Jeff Sharkey [Tue, 13 Dec 2011 04:19:27 +0000 (20:19 -0800)]
Merge "Avoid NPE when missing network stats." into ics-mr1
Mike Cleron [Tue, 13 Dec 2011 02:17:46 +0000 (18:17 -0800)]
am
840201d6: Merge "Update VIBRATE_ON to a supported value when upgrading from GB." into ics-mr1
* commit '
840201d6e2d7d53e42a31ffeb2ef454982882d12':
Update VIBRATE_ON to a supported value when upgrading from GB.
Mike Cleron [Tue, 13 Dec 2011 02:15:59 +0000 (18:15 -0800)]
Merge "Update VIBRATE_ON to a supported value when upgrading from GB." into ics-mr1
Dianne Hackborn [Tue, 13 Dec 2011 01:04:04 +0000 (17:04 -0800)]
Dianne Hackborn [Tue, 13 Dec 2011 00:12:40 +0000 (16:12 -0800)]
am
a1279586: Merge "SDK only: now that support lib is in SDK, we can link to it." into ics-mr1
* commit '
a1279586dd1a866dd58d669aa0980d71f6c589d9':
SDK only: now that support lib is in SDK, we can link to it.
Dianne Hackborn [Tue, 13 Dec 2011 00:09:54 +0000 (16:09 -0800)]
Merge "SDK only: now that support lib is in SDK, we can link to it." into ics-mr1
Gilles Debunne [Mon, 12 Dec 2011 23:56:33 +0000 (15:56 -0800)]
am
a1277de3: Merge "Prevent a memory leak in TextLine." into ics-mr1
* commit '
a1277de3c393fb0861d26ec5551ae4247e32dee4':
Prevent a memory leak in TextLine.
Gilles Debunne [Mon, 12 Dec 2011 23:54:38 +0000 (15:54 -0800)]
am
1fb90497: Merge "Text blinking cursor hard to see." into ics-mr1
* commit '
1fb90497b73b1560c55f1cb73cd394c3b8714212':
Text blinking cursor hard to see.
Gilles Debunne [Mon, 12 Dec 2011 23:53:25 +0000 (15:53 -0800)]
Merge "Prevent a memory leak in TextLine." into ics-mr1
Gilles Debunne [Mon, 12 Dec 2011 23:52:39 +0000 (15:52 -0800)]
Merge "Text blinking cursor hard to see." into ics-mr1
Adam Powell [Mon, 12 Dec 2011 23:42:22 +0000 (15:42 -0800)]
am
9c92fcd9: Merge "Bug
5727679 - CTS test ViewGroupTest#testGetChildVisibleRect" into ics-mr1
* commit '
9c92fcd91c67a98f3a767255e7d3748bca3ef751':
Bug
5727679 - CTS test ViewGroupTest#testGetChildVisibleRect
Adam Powell [Mon, 12 Dec 2011 23:40:00 +0000 (15:40 -0800)]
Merge "Bug
5727679 - CTS test ViewGroupTest#testGetChildVisibleRect" into ics-mr1
Jamie Gennis [Mon, 12 Dec 2011 22:12:33 +0000 (14:12 -0800)]
am
a1dee3f5: Merge "SurfaceTexture: fix a verbose-log compile error" into ics-mr1
* commit '
a1dee3f500eccedbf5e50d466315fb28ba812cfc':
SurfaceTexture: fix a verbose-log compile error
Jamie Gennis [Mon, 12 Dec 2011 22:10:04 +0000 (14:10 -0800)]
Merge "SurfaceTexture: fix a verbose-log compile error" into ics-mr1
Raphael [Mon, 12 Dec 2011 21:16:35 +0000 (13:16 -0800)]
am
2ace3b01: Merge "Merge "AAPT fix printf %zd crash on Windows". Do not merge." into ics-mr1
* commit '
2ace3b01ab9447ce9fda2f578e31c1c11f4837cb':
Merge "AAPT fix printf %zd crash on Windows". Do not merge.
Raphael [Mon, 12 Dec 2011 21:14:12 +0000 (13:14 -0800)]
Merge "Merge "AAPT fix printf %zd crash on Windows". Do not merge." into ics-mr1
Matthew Xie [Mon, 12 Dec 2011 20:09:13 +0000 (12:09 -0800)]
am
ed0830c5: Merge "Move broadcastState STATE_TURNING_ON before persistSwitchSetting" into ics-mr1
* commit '
ed0830c502d7403d69abfd8247c046ac2746ac8c':
Move broadcastState STATE_TURNING_ON before persistSwitchSetting
Matthew Xie [Mon, 12 Dec 2011 20:07:39 +0000 (12:07 -0800)]
Merge "Move broadcastState STATE_TURNING_ON before persistSwitchSetting" into ics-mr1
Eric Fischer [Mon, 12 Dec 2011 19:06:38 +0000 (11:06 -0800)]
am
386f2084: Merge "Import revised translations. DO NOT MERGE" into ics-mr1
* commit '
386f208489d85d81755b64e92a84290953accfc0':
Import revised translations. DO NOT MERGE
Eric Fischer [Mon, 12 Dec 2011 19:04:39 +0000 (11:04 -0800)]
Merge "Import revised translations. DO NOT MERGE" into ics-mr1
The Android Open Source Project [Mon, 12 Dec 2011 15:59:17 +0000 (07:59 -0800)]
Reconcile with ics-mr1-release
Change-Id: Ic9c27c987ae88da9ab333632b47837b0ff1dd6d3
The Android Open Source Project [Mon, 12 Dec 2011 15:47:34 +0000 (07:47 -0800)]
Merge from ics-mr1
Change-Id: I209499775ddf68b380d0ec801d558e1dc86ab953
The Android Automerger [Sat, 10 Dec 2011 00:17:04 +0000 (16:17 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Justin Ho [Fri, 9 Dec 2011 23:43:48 +0000 (15:43 -0800)]
am
1cec30a1: Merge "Quick settings icons updated to match ics style on tablet" into ics-mr1
* commit '
1cec30a182c1963beda4b6f11cfae9fa38061e68':
Quick settings icons updated to match ics style on tablet
Justin Ho [Fri, 9 Dec 2011 23:42:10 +0000 (15:42 -0800)]
Merge "Quick settings icons updated to match ics style on tablet" into ics-mr1
Jamie Gennis [Fri, 9 Dec 2011 23:07:44 +0000 (15:07 -0800)]
SurfaceTexture: fix a verbose-log compile error
Change-Id: I045231207e068d950bb0cb5085717af5d9454ed1
Jeff Tinker [Fri, 9 Dec 2011 19:13:39 +0000 (11:13 -0800)]
am
ef664f62: Merge "Fix drm flag setting missed in false drm recognition fix." into ics-mr1
* commit '
ef664f62a1525e8f53d0937e889333544ffef3ad':
Fix drm flag setting missed in false drm recognition fix.
Jeff Tinker [Fri, 9 Dec 2011 19:11:56 +0000 (11:11 -0800)]
Merge "Fix drm flag setting missed in false drm recognition fix." into ics-mr1
Joe Fernandez [Fri, 9 Dec 2011 18:47:59 +0000 (10:47 -0800)]
am
4b3227de: am
89c3bc38: Merge "docs: Android 4.0.2 (SDK Tools r16) Release Notes - RC6" into ics-mr0
* commit '
4b3227de17b6b4ee776cfb26aa33ce8ff1c195f0':
docs: Android 4.0.2 (SDK Tools r16) Release Notes - RC6
Joe Fernandez [Fri, 9 Dec 2011 18:45:44 +0000 (10:45 -0800)]
am
89c3bc38: Merge "docs: Android 4.0.2 (SDK Tools r16) Release Notes - RC6" into ics-mr0
* commit '
89c3bc38421a3f01b39f0246e53884bdf8b14415':
docs: Android 4.0.2 (SDK Tools r16) Release Notes - RC6
Joe Fernandez [Fri, 9 Dec 2011 18:43:32 +0000 (10:43 -0800)]
Merge "docs: Android 4.0.2 (SDK Tools r16) Release Notes - RC6" into ics-mr0
Gilles Debunne [Fri, 9 Dec 2011 17:36:23 +0000 (09:36 -0800)]
am
caf4ead3: Merge "Blinking cursor in Talk" into ics-mr1
* commit '
caf4ead320499cc9a7a2e3eb17beaaf92b391212':
Blinking cursor in Talk
Gilles Debunne [Fri, 9 Dec 2011 17:34:04 +0000 (09:34 -0800)]
Merge "Blinking cursor in Talk" into ics-mr1
The Android Open Source Project [Fri, 9 Dec 2011 15:11:09 +0000 (07:11 -0800)]
Reconcile with ics-mr1-release
Change-Id: Ieb1f3cdd9a69cff091b73983f68c03cb5d26b9d7
The Android Automerger [Fri, 9 Dec 2011 14:58:10 +0000 (06:58 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
James Dong [Fri, 9 Dec 2011 08:17:56 +0000 (00:17 -0800)]
am
aadbd80b: Fixed the false drm recognition.
* commit '
aadbd80b307c817698ce5110ff8e002804d1b230':
Fixed the false drm recognition.
Gilles Debunne [Fri, 9 Dec 2011 02:35:22 +0000 (18:35 -0800)]
am
be5f49fb: Performance improvements for long text edition.
* commit '
be5f49fb6e17e0b9588d3b94022b7e3eb6d47317':
Performance improvements for long text edition.
Gilles Debunne [Fri, 9 Dec 2011 02:19:57 +0000 (18:19 -0800)]
am
df372289: Merge "Fixed SpellCheckerSessions leak in TextView" into ics-mr1
* commit '
df3722895172e03c81787f62d922daabaad3e20b':
Fixed SpellCheckerSessions leak in TextView
Gilles Debunne [Fri, 9 Dec 2011 02:18:25 +0000 (18:18 -0800)]
Merge "Fixed SpellCheckerSessions leak in TextView" into ics-mr1
Gilles Debunne [Fri, 9 Dec 2011 02:00:12 +0000 (18:00 -0800)]
am
316ca505: Merge "Re-use SpanSets in TextLine" into ics-mr1
* commit '
316ca5059ebd7270a04da5649d25653c355e158d':
Re-use SpanSets in TextLine
Gilles Debunne [Fri, 9 Dec 2011 01:58:24 +0000 (17:58 -0800)]
Merge "Re-use SpanSets in TextLine" into ics-mr1
Joe Malin [Fri, 9 Dec 2011 01:46:44 +0000 (17:46 -0800)]
am
556e4ca5: am
0a9005ed: Merge "DOC CHANGE: Package text and Formatter javadoc" into ics-mr0
* commit '
556e4ca54161be17333ec98fadc113485120a6e8':
DOC CHANGE: Package text and Formatter javadoc
Joe Malin [Fri, 9 Dec 2011 01:44:34 +0000 (17:44 -0800)]
am
0a9005ed: Merge "DOC CHANGE: Package text and Formatter javadoc" into ics-mr0
* commit '
0a9005ed58d3a6173e8fffbd72933f7646c6fdba':
DOC CHANGE: Package text and Formatter javadoc
Joe Malin [Fri, 9 Dec 2011 01:42:36 +0000 (17:42 -0800)]
Merge "DOC CHANGE: Package text and Formatter javadoc" into ics-mr0
The Android Automerger [Fri, 9 Dec 2011 01:35:27 +0000 (17:35 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Chia-chi Yeh [Fri, 9 Dec 2011 01:24:16 +0000 (17:24 -0800)]
am
46a4e81d: Merge "VPN: delete the "abort" file before starting VPN daemons." into ics-mr1
* commit '
46a4e81dbdc9a5f401b5a3c0d26dea2e42b61487':
VPN: delete the "abort" file before starting VPN daemons.
Chia-chi Yeh [Fri, 9 Dec 2011 01:22:16 +0000 (17:22 -0800)]
Merge "VPN: delete the "abort" file before starting VPN daemons." into ics-mr1
Irfan Sheriff [Fri, 9 Dec 2011 00:01:59 +0000 (16:01 -0800)]
am
97ff7893: Merge "Fix wifi bring up at boot up" into ics-mr1
* commit '
97ff7893321362020211fae3c5a52b95c3ec19e1':
Fix wifi bring up at boot up
Irfan Sheriff [Thu, 8 Dec 2011 23:59:26 +0000 (15:59 -0800)]
Merge "Fix wifi bring up at boot up" into ics-mr1
Jake Hamby [Thu, 8 Dec 2011 23:53:42 +0000 (15:53 -0800)]
am
c40f70a5: Merge "Swap OK and Cancel buttons in SIM PIN unlock screen to match ICS guidelines." into ics-mr1
* commit '
c40f70a5cb1f24a9ea0b5b0cadea75db8fc1cdd3':
Swap OK and Cancel buttons in SIM PIN unlock screen to match ICS guidelines.
Jake Hamby [Thu, 8 Dec 2011 23:51:33 +0000 (15:51 -0800)]
Merge "Swap OK and Cancel buttons in SIM PIN unlock screen to match ICS guidelines." into ics-mr1
Andreas Huber [Thu, 8 Dec 2011 21:35:53 +0000 (13:35 -0800)]
am
68f592a8: Merge "Don\'t perform RTSP seeks right away but queue them for 200ms" into ics-mr1
* commit '
68f592a8210af27df4339089bbee47fb602cae6a':
Don't perform RTSP seeks right away but queue them for 200ms
Andreas Huber [Thu, 8 Dec 2011 21:35:51 +0000 (13:35 -0800)]
am
0ba9380a: Merge "Fix Bitreader "putBits" implementation, make sure we emulate timestamps" into ics-mr1
* commit '
0ba9380a337d5e2eae9fd9e4eb8039403ed3815b':
Fix Bitreader "putBits" implementation, make sure we emulate timestamps
Andreas Huber [Thu, 8 Dec 2011 21:33:16 +0000 (13:33 -0800)]
Merge "Don't perform RTSP seeks right away but queue them for 200ms" into ics-mr1
Andreas Huber [Thu, 8 Dec 2011 21:33:06 +0000 (13:33 -0800)]
Merge "Fix Bitreader "putBits" implementation, make sure we emulate timestamps" into ics-mr1
Svetoslav Ganov [Thu, 8 Dec 2011 20:30:14 +0000 (12:30 -0800)]
am
48b428fb: Merge "NumberPicker getting stuck if scroll wheel not wrapable." into ics-mr1
* commit '
48b428fb1369a787a15fa6d8ebf10f8b31937a8b':
NumberPicker getting stuck if scroll wheel not wrapable.
Svetoslav Ganov [Thu, 8 Dec 2011 20:28:11 +0000 (12:28 -0800)]
Merge "NumberPicker getting stuck if scroll wheel not wrapable." into ics-mr1
Irfan Sheriff [Thu, 8 Dec 2011 20:23:03 +0000 (12:23 -0800)]
am
583fdf00: Merge "Handle emergency call back mode correctly" into ics-mr1
* commit '
583fdf0068ac46fb384a5aa2b193faf743f8221c':
Handle emergency call back mode correctly
Irfan Sheriff [Thu, 8 Dec 2011 20:21:20 +0000 (12:21 -0800)]
Merge "Handle emergency call back mode correctly" into ics-mr1
Gilles Debunne [Thu, 8 Dec 2011 19:58:33 +0000 (11:58 -0800)]
am
aa4a5713: Merge "Make the Next key navigate between TextViews" into ics-mr1
* commit '
aa4a5713aab73cf7c9486cd587a0d986a8daf7e3':
Make the Next key navigate between TextViews
Gilles Debunne [Thu, 8 Dec 2011 19:58:31 +0000 (11:58 -0800)]
am
0e7b8020: Merge "Limit created string size in Spell Checker" into ics-mr1
* commit '
0e7b8020fd8607957844f7d67e8aaa6dc2ef816f':
Limit created string size in Spell Checker
Gilles Debunne [Thu, 8 Dec 2011 19:57:06 +0000 (11:57 -0800)]
Merge "Make the Next key navigate between TextViews" into ics-mr1
Gilles Debunne [Thu, 8 Dec 2011 19:56:28 +0000 (11:56 -0800)]
Merge "Limit created string size in Spell Checker" into ics-mr1
Eric Fischer [Thu, 8 Dec 2011 19:11:06 +0000 (11:11 -0800)]
am
ab6b816a: Merge "Import revised translations. DO NOT MERGE" into ics-mr1
* commit '
ab6b816a76c77f1ecd9a0ae911026aaba062f6d1':
Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 8 Dec 2011 19:09:11 +0000 (11:09 -0800)]
Merge "Import revised translations. DO NOT MERGE" into ics-mr1
The Android Open Source Project [Thu, 8 Dec 2011 18:29:04 +0000 (10:29 -0800)]
am
641a5624: Reconcile with ics-mr0-release
* commit '
641a5624075ee942b85b17646b57f65377567a06':
The Android Open Source Project [Thu, 8 Dec 2011 18:26:33 +0000 (10:26 -0800)]
Reconcile with ics-mr0-release
Change-Id: I2b2afc572c36ef210d81af16bd2e52cecdd94079
The Android Open Source Project [Thu, 8 Dec 2011 18:21:43 +0000 (10:21 -0800)]
Reconcile with ics-mr0-release ics-mr1-release
Change-Id: Ia4cdb4ae14cd906ff06b5e92ef3baeb7394e654c
Gilles Debunne [Thu, 8 Dec 2011 18:01:29 +0000 (10:01 -0800)]
am
a5a98a03: Merge "IOOB is Suggestions" into ics-mr1
* commit '
a5a98a034b4d52c6bbc75e72f74f1a6ea1c61ed5':
IOOB is Suggestions
Gilles Debunne [Thu, 8 Dec 2011 18:01:27 +0000 (10:01 -0800)]
am
89f2e8a0: Merge "Prevent NPE in SuggestionSpan" into ics-mr1
* commit '
89f2e8a099c32cdbb8409482fe91dabea5a7673e':
Prevent NPE in SuggestionSpan
Gilles Debunne [Thu, 8 Dec 2011 17:59:44 +0000 (09:59 -0800)]
Merge "IOOB is Suggestions" into ics-mr1
Gilles Debunne [Thu, 8 Dec 2011 17:59:29 +0000 (09:59 -0800)]
Merge "Prevent NPE in SuggestionSpan" into ics-mr1
The Android Automerger [Thu, 8 Dec 2011 15:00:35 +0000 (07:00 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Jeff Tinker [Thu, 8 Dec 2011 08:16:22 +0000 (00:16 -0800)]
am
a693a4b5: Merge "Fix ANRs due to Widevine DRM plugin sniff taking too long." into ics-mr1
* commit '
a693a4b5553584a01b8b6b3640dc0393d2d88f28':
Fix ANRs due to Widevine DRM plugin sniff taking too long.
Jeff Tinker [Thu, 8 Dec 2011 08:13:43 +0000 (00:13 -0800)]
Merge "Fix ANRs due to Widevine DRM plugin sniff taking too long." into ics-mr1
Jeff Brown [Thu, 8 Dec 2011 07:31:03 +0000 (23:31 -0800)]
am
8e0ecbfc: Merge "Shortcut keys should be handled on down, not up." into ics-mr1
* commit '
8e0ecbfc97606ea30d0d8216fea635888f766b9d':
Shortcut keys should be handled on down, not up.
Jeff Brown [Thu, 8 Dec 2011 07:31:02 +0000 (23:31 -0800)]
am
e0e9fd98: Merge "Fix system hotkey handling." into ics-mr1
* commit '
e0e9fd981ca71aeaa45c888485c11788456bd838':
Fix system hotkey handling.
Jeff Brown [Thu, 8 Dec 2011 07:29:52 +0000 (23:29 -0800)]
Merge "Shortcut keys should be handled on down, not up." into ics-mr1
Jeff Brown [Thu, 8 Dec 2011 07:29:45 +0000 (23:29 -0800)]
Merge "Fix system hotkey handling." into ics-mr1
Dave Burke [Thu, 8 Dec 2011 04:41:27 +0000 (20:41 -0800)]
am
ef8913c0: Merge "Remove dangerous and useless optimization Bug #
5525888" into ics-mr1
* commit '
ef8913c035e679ea8b8891e26db1fa571e9b9d54':
Remove dangerous and useless optimization Bug #
5525888
Dave Burke [Thu, 8 Dec 2011 04:40:10 +0000 (20:40 -0800)]
Merge "Remove dangerous and useless optimization Bug #
5525888" into ics-mr1
Wink Saville [Thu, 8 Dec 2011 04:18:06 +0000 (20:18 -0800)]
am
234a5ef6: Merge "When the SIM_READY set current preferred network type." into ics-mr1
* commit '
234a5ef66275087aff9cfb94adc7608e9f358f11':
When the SIM_READY set current preferred network type.
Wink Saville [Thu, 8 Dec 2011 04:15:45 +0000 (20:15 -0800)]
Merge "When the SIM_READY set current preferred network type." into ics-mr1
Jaikumar Ganesh [Thu, 8 Dec 2011 03:52:11 +0000 (19:52 -0800)]
am
d426c338: Merge "Reduce likelihood of crash in state machine." into ics-mr1
* commit '
d426c338a66f63f8e5528ac38ec5b61625f2c897':
Reduce likelihood of crash in state machine.
Jaikumar Ganesh [Thu, 8 Dec 2011 03:50:03 +0000 (19:50 -0800)]
Merge "Reduce likelihood of crash in state machine." into ics-mr1
John Wang [Thu, 8 Dec 2011 02:51:11 +0000 (18:51 -0800)]
am
ca0a68cc: Merge "Correct the dialing number of structured MMI." into ics-mr1
* commit '
ca0a68cc8afd023c94bcd5a1f3f2b2f9407fbe3b':
Correct the dialing number of structured MMI.
John Wang [Thu, 8 Dec 2011 02:49:28 +0000 (18:49 -0800)]
Merge "Correct the dialing number of structured MMI." into ics-mr1
Gilles Debunne [Thu, 8 Dec 2011 02:42:04 +0000 (18:42 -0800)]
am
2df13452: Merge "Insert into user dict with the correct locale" into ics-mr1
* commit '
2df13452e05745a3da624c34018da983173c32c4':
Insert into user dict with the correct locale
Gilles Debunne [Thu, 8 Dec 2011 02:41:04 +0000 (18:41 -0800)]
Merge "Insert into user dict with the correct locale" into ics-mr1
Adam Powell [Thu, 8 Dec 2011 01:57:08 +0000 (17:57 -0800)]
am
cf6a6522: Merge "Raise touch slop value from previous experiment" into ics-mr1
* commit '
cf6a6522fdbce05896d3a551f7cd6243857ceced':
Raise touch slop value from previous experiment
Adam Powell [Thu, 8 Dec 2011 01:55:35 +0000 (17:55 -0800)]
Merge "Raise touch slop value from previous experiment" into ics-mr1
Daniel Sandler [Thu, 8 Dec 2011 01:42:07 +0000 (17:42 -0800)]
am
29933fb2: Merge "Improve handling of small largeIcons in tablet ticker." into ics-mr1
* commit '
29933fb26a4294a9bd30f9227809e28949252833':
Improve handling of small largeIcons in tablet ticker.
Daniel Sandler [Thu, 8 Dec 2011 01:40:07 +0000 (17:40 -0800)]
Merge "Improve handling of small largeIcons in tablet ticker." into ics-mr1
Joe Malin [Thu, 8 Dec 2011 01:14:47 +0000 (17:14 -0800)]
am
aa2719df: am
3937e055: Merge "DOC CHANGE: Add text for android.os.storage" into ics-mr0
* commit '
aa2719df72225402737009b1cc2e3cfea8e74bc7':
DOC CHANGE: Add text for android.os.storage
Dianne Hackborn [Thu, 8 Dec 2011 01:14:46 +0000 (17:14 -0800)]
am
0e385ee4: am
b32785c6: Merge "More fixing for issue #
5366535: Lockscreen has wrong layout..." into ics-mr0
* commit '
0e385ee4de901f4c509374fad5bc040a2ac80721':
More fixing for issue #
5366535: Lockscreen has wrong layout...
Dianne Hackborn [Thu, 8 Dec 2011 01:12:43 +0000 (17:12 -0800)]
am
b259c04d: Merge "Merge commit \'
eee12419\' into manualmerge" into ics-mr1
* commit '
b259c04d4321536ef9f5cc9b55079d3bd450eef7':
DO NOT MERGE. Integrate from MR 1 to fix issue #
5366535: Lockscreen...
Joe Malin [Thu, 8 Dec 2011 01:11:59 +0000 (17:11 -0800)]
am
3937e055: Merge "DOC CHANGE: Add text for android.os.storage" into ics-mr0
* commit '
3937e055708a8618f184feab204fed4bb41f3f6e':
DOC CHANGE: Add text for android.os.storage
OSDN Git Service
