OSDN Git Service
The Android Open Source Project [Mon, 12 Dec 2011 23:39:19 +0000 (15:39 -0800)]
am
40375099: Reconcile with ics-mr1-release
* commit '
40375099d10139b6c96c1db8b8295874d60c712e':
The Android Open Source Project [Mon, 12 Dec 2011 23:39:17 +0000 (15:39 -0800)]
am
f14dc291: Merge from ics-mr1
* commit '
f14dc29104340f8ccf9d42aef8dba2cc23f7f5e1':
Fix drm enumeration order, resolves failure to play forward lock ringtones
Irfan Sheriff [Mon, 12 Dec 2011 23:35:25 +0000 (15:35 -0800)]
Merge "Clean up synchronization"
Justin Ho [Mon, 12 Dec 2011 23:30:36 +0000 (15:30 -0800)]
am
df83cfc9: am
1cec30a1: Merge "Quick settings icons updated to match ics style on tablet" into ics-mr1
* commit '
df83cfc95c1b909ffcfc31f3dd30262a49cffced':
Quick settings icons updated to match ics style on tablet
Jeff Tinker [Mon, 12 Dec 2011 23:30:16 +0000 (15:30 -0800)]
am
dc44e06e: am
ef664f62: Merge "Fix drm flag setting missed in false drm recognition fix." into ics-mr1
* commit '
dc44e06ef305be8de060af69a468e003e231ba05':
Fix drm flag setting missed in false drm recognition fix.
Joe Fernandez [Mon, 12 Dec 2011 23:30:14 +0000 (15:30 -0800)]
am
a4f49ac5: am
4b3227de: am
89c3bc38: Merge "docs: Android 4.0.2 (SDK Tools r16) Release Notes - RC6" into ics-mr0
* commit '
a4f49ac5284d7ab97e56e318523652f35d9de0d6':
docs: Android 4.0.2 (SDK Tools r16) Release Notes - RC6
Gilles Debunne [Mon, 12 Dec 2011 23:30:10 +0000 (15:30 -0800)]
am
f107abec: am
caf4ead3: Merge "Blinking cursor in Talk" into ics-mr1
* commit '
f107abec56811dea1ae81c6abc78a68e433c1080':
Blinking cursor in Talk
The Android Open Source Project [Mon, 12 Dec 2011 23:29:56 +0000 (15:29 -0800)]
am
175d5d76: Reconcile with ics-mr1-release
* commit '
175d5d76b0aa9808b4214522a6fdf461109560ec':
James Dong [Mon, 12 Dec 2011 23:29:46 +0000 (15:29 -0800)]
am
406dd5d1: am
aadbd80b: Fixed the false drm recognition.
* commit '
406dd5d1e48752177753666867403542e1f400ca':
Fixed the false drm recognition.
Gilles Debunne [Mon, 12 Dec 2011 23:16:42 +0000 (15:16 -0800)]
resolved conflicts for merge of
1742f20c to master
Change-Id: I02d84edfe8cc0b71881884ecec21f831404aa555
Robert Greenwalt [Mon, 12 Dec 2011 22:02:02 +0000 (14:02 -0800)]
Merge "Use the carrier-given dns addrs for tethering."
Gilles Debunne [Mon, 12 Dec 2011 21:15:53 +0000 (13:15 -0800)]
am
afa0a714: am
df372289: Merge "Fixed SpellCheckerSessions leak in TextView" into ics-mr1
* commit '
afa0a714acb45e90bdda3fd72b529a817a25f2d1':
Fixed SpellCheckerSessions leak in TextView
Gilles Debunne [Mon, 12 Dec 2011 21:15:46 +0000 (13:15 -0800)]
am
e912a16b: am
316ca505: Merge "Re-use SpanSets in TextLine" into ics-mr1
* commit '
e912a16ba2a6e913b47893bc99c9a846d7ce80a9':
Re-use SpanSets in TextLine
Joe Malin [Mon, 12 Dec 2011 21:15:36 +0000 (13:15 -0800)]
am
8e94d912: am
556e4ca5: am
0a9005ed: Merge "DOC CHANGE: Package text and Formatter javadoc" into ics-mr0
* commit '
8e94d912c6e0fc3c6d5e992b6559a0efc20372be':
DOC CHANGE: Package text and Formatter javadoc
Chia-chi Yeh [Mon, 12 Dec 2011 21:15:34 +0000 (13:15 -0800)]
am
fa71962f: am
46a4e81d: Merge "VPN: delete the "abort" file before starting VPN daemons." into ics-mr1
* commit '
fa71962fe4595f484071ac0deb23f68d44932d83':
VPN: delete the "abort" file before starting VPN daemons.
Irfan Sheriff [Mon, 12 Dec 2011 20:35:12 +0000 (12:35 -0800)]
am
c34306e4: am
97ff7893: Merge "Fix wifi bring up at boot up" into ics-mr1
* commit '
c34306e46e0f53a9478216c2d5fd3129a3bc6f8e':
Fix wifi bring up at boot up
Jake Hamby [Mon, 12 Dec 2011 20:35:09 +0000 (12:35 -0800)]
am
555fe79c: am
c40f70a5: Merge "Swap OK and Cancel buttons in SIM PIN unlock screen to match ICS guidelines." into ics-mr1
* commit '
555fe79cdf037e7250f04591e60ecc8cff0cb95e':
Swap OK and Cancel buttons in SIM PIN unlock screen to match ICS guidelines.
Romain Guy [Mon, 12 Dec 2011 19:44:43 +0000 (11:44 -0800)]
Merge "Code cleanup"
Romain Guy [Mon, 12 Dec 2011 19:44:32 +0000 (11:44 -0800)]
Merge "Free up resources by deleting shaders early on"
Amith Yamasani [Mon, 12 Dec 2011 17:56:26 +0000 (09:56 -0800)]
Merge "Show the current stream's volume in the volume panel."
Andreas Huber [Mon, 12 Dec 2011 16:32:28 +0000 (08:32 -0800)]
Merge "Support for parsing of "folded" RTSP header values and some tweaks to the AMR assembler"
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
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
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
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.
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
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
Gilles Debunne [Sat, 10 Dec 2011 02:06:34 +0000 (18:06 -0800)]
resolved conflicts for merge of
5371a165 to master
Change-Id: I61830ec96c277ebba9db3e40842597b9c98d53c7
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."
Steven Ross [Sat, 10 Dec 2011 00:28:39 +0000 (16:28 -0800)]
Merge "Checking whether screen is on in constructor fixes
5658742"
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
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
The Android Open Source Project [Fri, 9 Dec 2011 22:58:07 +0000 (14:58 -0800)]
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...
Nick Pelly [Fri, 9 Dec 2011 22:37:05 +0000 (14:37 -0800)]
Merge "Add BluetoothAdapter.getRemoteDevice(byte[])"
Nick Pelly [Fri, 9 Dec 2011 22:36:23 +0000 (14:36 -0800)]
Merge "Fix BasicNfcEeTest java package."
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
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
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.
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.
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.
Jack Palevich [Fri, 9 Dec 2011 22:19:39 +0000 (14:19 -0800)]
Merge "Fix convert8To4, convert8To5"
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
Irfan Sheriff [Fri, 9 Dec 2011 20:43:28 +0000 (12:43 -0800)]
Merge "Change RSSI notification levels to 5 in framework"
Romain Guy [Fri, 9 Dec 2011 20:28:46 +0000 (12:28 -0800)]
Merge "Enable dirty regions on newly created EGL surfaces"
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
Kristian Monsen [Fri, 9 Dec 2011 18:12:41 +0000 (10:12 -0800)]
Merge "Update string lengths, fix for bug
5732776"
Alex Sakhartchouk [Fri, 9 Dec 2011 18:04:27 +0000 (10:04 -0800)]
Merge "Making UI a bit more responsive."
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
Narayan Kamath [Fri, 9 Dec 2011 14:30:14 +0000 (06:30 -0800)]
Merge "Remove BlockingMediaPlayer."
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.
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"
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
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
Fabrice Di Meglio [Thu, 8 Dec 2011 23:42:28 +0000 (15:42 -0800)]
Merge "Clean TextLayout code and remove RTL_USE_HARFBUZZ"
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