git.osdn.net Git - android-x86/frameworks-native.git/log

Ben Murdoch [Mon, 12 Dec 2011 11:13:46 +0000 (03:13 -0800)]

Merge "Clear the WebView picture when a new load starts."

Makoto Onuki [Sat, 10 Dec 2011 21:23:59 +0000 (13:23 -0800)]

Merge "MCC detection fixes for CountryDetector"

Andreas Huber [Sat, 10 Dec 2011 02:09:21 +0000 (18:09 -0800)]

am ebfce84f: am 68f592a8: Merge "Don\'t perform RTSP seeks right away but queue them for 200ms" into ics-mr1

* commit 'ebfce84f7fd3e25fa08c36b155db91df90a59b3d':
Don't perform RTSP seeks right away but queue them for 200ms

commit | commitdiff | tree

Andreas Huber [Sat, 10 Dec 2011 02:09:19 +0000 (18:09 -0800)]

am aa82c39b: am 0ba9380a: Merge "Fix Bitreader "putBits" implementation, make sure we emulate timestamps" into ics-mr1

* commit 'aa82c39bdb4ad9c1fdcb09f3bea11be5197d3ce6':
Fix Bitreader "putBits" implementation, make sure we emulate timestamps

commit | commitdiff | tree

Svetoslav Ganov [Sat, 10 Dec 2011 02:09:16 +0000 (18:09 -0800)]

am 33a3b2ce: am 48b428fb: Merge "NumberPicker getting stuck if scroll wheel not wrapable." into ics-mr1

* commit '33a3b2cecf174cb14097498214131fcfb32ec04c':
NumberPicker getting stuck if scroll wheel not wrapable.

commit | commitdiff | tree

Irfan Sheriff [Sat, 10 Dec 2011 02:09:07 +0000 (18:09 -0800)]

am a3c7c358: am 583fdf00: Merge "Handle emergency call back mode correctly" into ics-mr1

* commit 'a3c7c35873235486787d58fa8310eebd87508bc9':
Handle emergency call back mode correctly

commit | commitdiff | tree

Gilles Debunne [Sat, 10 Dec 2011 02:09:03 +0000 (18:09 -0800)]

am b25d417f: am aa4a5713: Merge "Make the Next key navigate between TextViews" into ics-mr1

* commit 'b25d417fce0e0467187ac187a4dabae75d5dc83d':
Make the Next key navigate between TextViews

commit | commitdiff | tree

Gilles Debunne [Sat, 10 Dec 2011 02:06:34 +0000 (18:06 -0800)]

resolved conflicts for merge of 5371a165 to master

Change-Id: I61830ec96c277ebba9db3e40842597b9c98d53c7

commit | commitdiff | tree

Claudia de Veaux [Sat, 10 Dec 2011 00:42:11 +0000 (16:42 -0800)]

Merge "Edit to string to change "double-touch" to "double-tap" per standard language."

commit | commitdiff | tree

Steven Ross [Sat, 10 Dec 2011 00:28:39 +0000 (16:28 -0800)]

Merge "Checking whether screen is on in constructor fixes 5658742"

commit | commitdiff | tree

Eric Fischer [Fri, 9 Dec 2011 22:58:10 +0000 (14:58 -0800)]

am 8430094c: (-s ours) am ab6b816a: Merge "Import revised translations. DO NOT MERGE" into ics-mr1

* commit '8430094cd9ecfcb932014ed5ae2d3db095bc7382':
Import revised translations. DO NOT MERGE

commit | commitdiff | tree

The Android Open Source Project [Fri, 9 Dec 2011 22:58:07 +0000 (14:58 -0800)]

am abe0ed49: am 641a5624: Reconcile with ics-mr0-release

* commit 'abe0ed4916537bf7244a4723e374591bfcf7e967':

commit | commitdiff | tree

The Android Open Source Project [Fri, 9 Dec 2011 22:57:48 +0000 (14:57 -0800)]

am 54854d31: Reconcile with ics-mr0-release ics-mr1-release

* commit '54854d311731b321e2bb2faec06bacb11d1fe07f':
More fixing for issue #5366535: Lockscreen has wrong layout...
DO NOT MERGE. Integrate from MR 1 to fix issue #5366535: Lockscreen...

commit | commitdiff | tree

Nick Pelly [Fri, 9 Dec 2011 22:37:05 +0000 (14:37 -0800)]

Merge "Add BluetoothAdapter.getRemoteDevice(byte[])"

commit | commitdiff | tree

Nick Pelly [Fri, 9 Dec 2011 22:36:23 +0000 (14:36 -0800)]

Merge "Fix BasicNfcEeTest java package."

commit | commitdiff | tree

Gilles Debunne [Fri, 9 Dec 2011 22:25:55 +0000 (14:25 -0800)]

am aee940df: am a5a98a03: Merge "IOOB is Suggestions" into ics-mr1

* commit 'aee940df55b5d1f769f56ff8a6dd645253b7f8e5':
IOOB is Suggestions

commit | commitdiff | tree

Gilles Debunne [Fri, 9 Dec 2011 22:25:53 +0000 (14:25 -0800)]

am 9f4b70c7: am 89f2e8a0: Merge "Prevent NPE in SuggestionSpan" into ics-mr1

* commit '9f4b70c72508077f39a71bb17df265eb883c7a20':
Prevent NPE in SuggestionSpan

commit | commitdiff | tree

Jeff Tinker [Fri, 9 Dec 2011 22:25:49 +0000 (14:25 -0800)]

am a5038d16: am a693a4b5: Merge "Fix ANRs due to Widevine DRM plugin sniff taking too long." into ics-mr1

* commit 'a5038d169f47b2e2278c0056495dfd4808803f8a':
Fix ANRs due to Widevine DRM plugin sniff taking too long.

commit | commitdiff | tree

Jeff Brown [Fri, 9 Dec 2011 22:25:41 +0000 (14:25 -0800)]

am 03e63427: am 8e0ecbfc: Merge "Shortcut keys should be handled on down, not up." into ics-mr1

* commit '03e634270d880407316b51fac2278e604fc82703':
Shortcut keys should be handled on down, not up.

commit | commitdiff | tree

Jeff Brown [Fri, 9 Dec 2011 22:25:38 +0000 (14:25 -0800)]

am 944c985b: am e0e9fd98: Merge "Fix system hotkey handling." into ics-mr1

* commit '944c985b4199e6e029568ea87004c9727e469cc0':
Fix system hotkey handling.

commit | commitdiff | tree

Jack Palevich [Fri, 9 Dec 2011 22:19:39 +0000 (14:19 -0800)]

Merge "Fix convert8To4, convert8To5"

commit | commitdiff | tree

Jack Palevich [Fri, 9 Dec 2011 22:06:07 +0000 (14:06 -0800)]

Fix convert8To4, convert8To5

See b/5680952 "Compilation warnings in etc1.cpp" for discussion.

Fixes b/5680952

Change-Id: I0af6ba5ed5e60f3ed7a6a28eba3b09504fee1a3f

commit | commitdiff | tree

Irfan Sheriff [Fri, 9 Dec 2011 20:43:28 +0000 (12:43 -0800)]

Merge "Change RSSI notification levels to 5 in framework"

commit | commitdiff | tree

Romain Guy [Fri, 9 Dec 2011 20:28:46 +0000 (12:28 -0800)]

Merge "Enable dirty regions on newly created EGL surfaces"

commit | commitdiff | tree

Kristian Monsen [Fri, 9 Dec 2011 18:12:41 +0000 (10:12 -0800)]

Merge "Update string lengths, fix for bug 5732776"

commit | commitdiff | tree

Alex Sakhartchouk [Fri, 9 Dec 2011 18:04:27 +0000 (10:04 -0800)]

Merge "Making UI a bit more responsive."

commit | commitdiff | tree

Narayan Kamath [Fri, 9 Dec 2011 14:30:14 +0000 (06:30 -0800)]

Merge "Remove BlockingMediaPlayer."

commit | commitdiff | tree

Romain Guy [Fri, 9 Dec 2011 02:51:03 +0000 (18:51 -0800)]

Merge "GenerationCache::get would return a random value instead of NULL Bug #5401917"

commit | commitdiff | tree

Romain Guy [Fri, 9 Dec 2011 02:19:39 +0000 (18:19 -0800)]

GenerationCache::get would return a random value instead of NULL
Bug #5401917

This was causing a ton of random crashes in apps.

Change-Id: I9069a060824ec89115cd3bcd38beaeb9ecc4488e

commit | commitdiff | tree

Fabrice Di Meglio [Thu, 8 Dec 2011 23:42:28 +0000 (15:42 -0800)]

Merge "Clean TextLayout code and remove RTL_USE_HARFBUZZ"

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Irfan Sheriff [Thu, 8 Dec 2011 20:21:20 +0000 (12:21 -0800)]

Merge "Handle emergency call back mode correctly" into ics-mr1

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Gilles Debunne [Thu, 8 Dec 2011 19:57:06 +0000 (11:57 -0800)]

Merge "Make the Next key navigate between TextViews" into ics-mr1

commit | commitdiff | tree

Gilles Debunne [Thu, 8 Dec 2011 19:56:28 +0000 (11:56 -0800)]

Merge "Limit created string size in Spell Checker" into ics-mr1

commit | commitdiff | tree

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

commit | commitdiff | tree

Eric Fischer [Thu, 8 Dec 2011 19:09:11 +0000 (11:09 -0800)]

Merge "Import revised translations. DO NOT MERGE" into ics-mr1

commit | commitdiff | tree

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':

commit | commitdiff | tree

The Android Open Source Project [Thu, 8 Dec 2011 18:26:33 +0000 (10:26 -0800)]

Reconcile with ics-mr0-release

Change-Id: I2b2afc572c36ef210d81af16bd2e52cecdd94079

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Gilles Debunne [Thu, 8 Dec 2011 17:59:44 +0000 (09:59 -0800)]

Merge "IOOB is Suggestions" into ics-mr1

commit | commitdiff | tree

Gilles Debunne [Thu, 8 Dec 2011 17:59:29 +0000 (09:59 -0800)]

Merge "Prevent NPE in SuggestionSpan" into ics-mr1

commit | commitdiff | tree

Kenny Root [Thu, 8 Dec 2011 17:02:51 +0000 (09:02 -0800)]

Merge "Add aapt support for implicitly-granted permissions"

commit | commitdiff | tree

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

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

Jeff Brown [Thu, 8 Dec 2011 07:29:45 +0000 (23:29 -0800)]

Merge "Fix system hotkey handling." into ics-mr1

commit | commitdiff | tree

James Dong [Thu, 8 Dec 2011 07:05:03 +0000 (23:05 -0800)]

Merge "Update onVideoSizeChanged() callback method Java doc to explicitly specify the conditions under which the width/height passed to the callback could be 0."

commit | commitdiff | tree

Dave Burke [Thu, 8 Dec 2011 04:43:18 +0000 (20:43 -0800)]

am e118c1de: am ef8913c0: Merge "Remove dangerous and useless optimization Bug #5525888" into ics-mr1

* commit 'e118c1de0037e6732b66b9f52903567caa961c31':
Remove dangerous and useless optimization Bug #5525888

commit | commitdiff | tree

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

commit | commitdiff | tree

Dave Burke [Thu, 8 Dec 2011 04:40:10 +0000 (20:40 -0800)]

Merge "Remove dangerous and useless optimization Bug #5525888" into ics-mr1

commit | commitdiff | tree

Wink Saville [Thu, 8 Dec 2011 04:19:50 +0000 (20:19 -0800)]

am ea75b822: am 234a5ef6: Merge "When the SIM_READY set current preferred network type." into ics-mr1

* commit 'ea75b82221dc9086cf97a791aed3b79ff3731bba':
When the SIM_READY set current preferred network type.

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

Jaikumar Ganesh [Thu, 8 Dec 2011 03:53:47 +0000 (19:53 -0800)]

am 38342c9d: am d426c338: Merge "Reduce likelihood of crash in state machine." into ics-mr1

* commit '38342c9d858d8b021bc5c616cfe6c0ab9f359b2b':
Reduce likelihood of crash in state machine.

commit | commitdiff | tree

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.

commit | commitdiff | tree

Jaikumar Ganesh [Thu, 8 Dec 2011 03:50:03 +0000 (19:50 -0800)]

Merge "Reduce likelihood of crash in state machine." into ics-mr1

commit | commitdiff | tree

John Wang [Thu, 8 Dec 2011 03:03:42 +0000 (19:03 -0800)]

am 2de0b07f: am ca0a68cc: Merge "Correct the dialing number of structured MMI." into ics-mr1

* commit '2de0b07f47c3561b6e550ff630901d2776a437e3':
Correct the dialing number of structured MMI.

commit | commitdiff | tree

Gilles Debunne [Thu, 8 Dec 2011 03:03:30 +0000 (19:03 -0800)]

am 0235016a: am 2df13452: Merge "Insert into user dict with the correct locale" into ics-mr1

* commit '0235016acb241556f24689e3d818db6973b5ad4f':
Insert into user dict with the correct locale

commit | commitdiff | tree

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.

commit | commitdiff | tree

John Wang [Thu, 8 Dec 2011 02:49:28 +0000 (18:49 -0800)]

Merge "Correct the dialing number of structured MMI." into ics-mr1

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Adam Powell [Thu, 8 Dec 2011 02:18:58 +0000 (18:18 -0800)]

resolved conflicts for merge of db81dc72 to master

Change-Id: Ie7e1d9a255934e45d8b241b15e9674046cff2444

commit | commitdiff | tree

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

commit | commitdiff | tree

Adam Powell [Thu, 8 Dec 2011 01:55:35 +0000 (17:55 -0800)]

Merge "Raise touch slop value from previous experiment" into ics-mr1

commit | commitdiff | tree

Daniel Sandler [Thu, 8 Dec 2011 01:43:39 +0000 (17:43 -0800)]

am b490d8d6: am 29933fb2: Merge "Improve handling of small largeIcons in tablet ticker." into ics-mr1

* commit 'b490d8d6214114391622b4302ca2f5f39b2166c6':
Improve handling of small largeIcons in tablet ticker.

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

Joe Malin [Thu, 8 Dec 2011 01:17:09 +0000 (17:17 -0800)]

am bea42859: am aa2719df: am 3937e055: Merge "DOC CHANGE: Add text for android.os.storage" into ics-mr0

* commit 'bea4285934b4cd5bab21f7c69ac82d871b6ee05f':
DOC CHANGE: Add text for android.os.storage

commit | commitdiff | tree

Dianne Hackborn [Thu, 8 Dec 2011 01:17:07 +0000 (17:17 -0800)]

am 7377e593: am 0e385ee4: am b32785c6: Merge "More fixing for issue #5366535: Lockscreen has wrong layout..." into ics-mr0

* commit '7377e59314885b8ef65bd19d04984998cb2e5ff4':
More fixing for issue #5366535: Lockscreen has wrong layout...

commit | commitdiff | tree

Dianne Hackborn [Thu, 8 Dec 2011 01:14:48 +0000 (17:14 -0800)]

am 2657d889: (-s ours) am b259c04d: Merge "Merge commit \'eee12419\' into manualmerge" into ics-mr1

* commit '2657d889ea7e60f5d97926dc7720e9780b6796e0':
DO NOT MERGE. Integrate from MR 1 to fix issue #5366535: Lockscreen...

commit | commitdiff | tree

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

commit | commitdiff | tree

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...

commit | commitdiff | tree

Robert Greenwalt [Thu, 8 Dec 2011 01:12:47 +0000 (17:12 -0800)]

am 4741163c: am fbb09ea8: Merge "Fix NPE in trimV4AddrZeros." into ics-mr1

* commit '4741163cd719ce88eddf17ebb0a3ffd6a8044fbe':
Fix NPE in trimV4AddrZeros.

commit | commitdiff | tree

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...

commit | commitdiff | tree

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

commit | commitdiff | tree

Dianne Hackborn [Thu, 8 Dec 2011 01:11:57 +0000 (17:11 -0800)]

am b32785c6: Merge "More fixing for issue #5366535: Lockscreen has wrong layout..." into ics-mr0

* commit 'b32785c6e893743956e28b285b8e6f6fc7aa8edb':
More fixing for issue #5366535: Lockscreen has wrong layout...

commit | commitdiff | tree

Robert Greenwalt [Thu, 8 Dec 2011 01:10:37 +0000 (17:10 -0800)]

am fbb09ea8: Merge "Fix NPE in trimV4AddrZeros." into ics-mr1

* commit 'fbb09ea84f7a9df94358f05f4e680cb363bae663':
Fix NPE in trimV4AddrZeros.

commit | commitdiff | tree

Dianne Hackborn [Thu, 8 Dec 2011 01:10:34 +0000 (17:10 -0800)]

Merge "Merge commit 'eee12419' into manualmerge" into ics-mr1

commit | commitdiff | tree

Robert Greenwalt [Thu, 8 Dec 2011 01:09:05 +0000 (17:09 -0800)]

Merge "Fix NPE in trimV4AddrZeros." into ics-mr1

commit | commitdiff | tree

Amith Yamasani [Thu, 8 Dec 2011 00:58:45 +0000 (16:58 -0800)]

am 675a5ba8: am 3b5555fc: Merge "Make new ringer toggles on power menu accessible and navigable with keyboard." into ics-mr1

* commit '675a5ba82f886d8a5f954219b6544a97acb17e29':
Make new ringer toggles on power menu accessible and navigable with keyboard.

commit | commitdiff | tree

Amith Yamasani [Thu, 8 Dec 2011 00:56:17 +0000 (16:56 -0800)]

am 3b5555fc: Merge "Make new ringer toggles on power menu accessible and navigable with keyboard." into ics-mr1

* commit '3b5555fc4483f6813f3df4787d98dd5357851566':
Make new ringer toggles on power menu accessible and navigable with keyboard.

commit | commitdiff | tree

Amith Yamasani [Thu, 8 Dec 2011 00:54:31 +0000 (16:54 -0800)]

Merge "Make new ringer toggles on power menu accessible and navigable with keyboard." into ics-mr1

commit | commitdiff | tree

Eric Laurent [Thu, 8 Dec 2011 00:45:07 +0000 (16:45 -0800)]

Merge "Fix audio effect tests"

commit | commitdiff | tree

Daniel Sandler [Thu, 8 Dec 2011 00:38:12 +0000 (16:38 -0800)]

am 940a49c8: am dc8cb9aa: Merge "Invalidate the whole status bar after layout transitions." into ics-mr1

* commit '940a49c89c0ccca8ba38028c209a4a135b23dd8f':
Invalidate the whole status bar after layout transitions.

commit | commitdiff | tree

Daniel Sandler [Thu, 8 Dec 2011 00:35:46 +0000 (16:35 -0800)]

am dc8cb9aa: Merge "Invalidate the whole status bar after layout transitions." into ics-mr1

* commit 'dc8cb9aa7e8f341ab88ae57e9d2cb99502844e5b':
Invalidate the whole status bar after layout transitions.

commit | commitdiff | tree

Daniel Sandler [Thu, 8 Dec 2011 00:33:31 +0000 (16:33 -0800)]

Merge "Invalidate the whole status bar after layout transitions." into ics-mr1