OSDN Git Service
Fabrice Di Meglio [Tue, 13 Dec 2011 23:41:47 +0000 (15:41 -0800)]
Merge "TextLayoutCache - fix diacritics composition"
Amith Yamasani [Tue, 13 Dec 2011 23:39:17 +0000 (15:39 -0800)]
Merge "Dump system and secure settings in bugreport."
Chet Haase [Tue, 13 Dec 2011 22:03:43 +0000 (14:03 -0800)]
Merge "Make glyph cache more flexible"
Dianne Hackborn [Tue, 13 Dec 2011 21:44:14 +0000 (13:44 -0800)]
am
0be53567: am
19a06fe9: Merge "Fix issue #
5755172: Soft menu key disappears when menu is open" into ics-mr1
* commit '
0be53567c1c2299c548d3204d2b9240108fbd53a':
Fix issue #
5755172: Soft menu key disappears when menu is open
Gilles Debunne [Tue, 13 Dec 2011 21:42:07 +0000 (13:42 -0800)]
am
0d3a5e4c: am
67d54ac0: Merge "NPE in GMail / TextLine" into ics-mr1
* commit '
0d3a5e4cbddc9a6a0a551698b5152c815842952a':
NPE in GMail / TextLine
Dianne Hackborn [Tue, 13 Dec 2011 21:42:07 +0000 (13:42 -0800)]
am
19a06fe9: Merge "Fix issue #
5755172: Soft menu key disappears when menu is open" into ics-mr1
* commit '
19a06fe93cccb4b1dd224b8456969821a19b07ef':
Fix issue #
5755172: Soft menu key disappears when menu is open
Gilles Debunne [Tue, 13 Dec 2011 21:40:00 +0000 (13:40 -0800)]
am
67d54ac0: Merge "NPE in GMail / TextLine" into ics-mr1
* commit '
67d54ac017494229eed27a184159461d63201a9f':
NPE in GMail / TextLine
Dianne Hackborn [Tue, 13 Dec 2011 21:38:56 +0000 (13:38 -0800)]
Merge "Fix issue #
5755172: Soft menu key disappears when menu is open" into ics-mr1
Gilles Debunne [Tue, 13 Dec 2011 21:37:29 +0000 (13:37 -0800)]
Merge "NPE in GMail / TextLine" into ics-mr1
Scott Main [Tue, 13 Dec 2011 21:15:27 +0000 (13:15 -0800)]
am
9a8e7afc: am
c9295b20: am
fc279e51: Merge "Created Android University lesson for Multiple APKs." into ics-mr0
* commit '
9a8e7afc53e39e22664c77b3ca6f1a59aac36ee3':
Created Android University lesson for Multiple APKs.
Scott Main [Tue, 13 Dec 2011 21:15:25 +0000 (13:15 -0800)]
am
04c6e62c: am
37191e1d: am
801fda54: AndroidU lesson on designing for multiple screens.
* commit '
04c6e62ce4750beb617eb6e4e9cadfd631bfe824':
AndroidU lesson on designing for multiple screens.
Romain Guy [Tue, 13 Dec 2011 21:13:31 +0000 (13:13 -0800)]
Merge "Reduce the number of GL commands generated by the UI"
Scott Main [Tue, 13 Dec 2011 21:13:15 +0000 (13:13 -0800)]
am
c9295b20: am
fc279e51: Merge "Created Android University lesson for Multiple APKs." into ics-mr0
* commit '
c9295b2069af6530fba37a16c88757acaaff63e8':
Created Android University lesson for Multiple APKs.
Scott Main [Tue, 13 Dec 2011 21:13:07 +0000 (13:13 -0800)]
am
37191e1d: am
801fda54: AndroidU lesson on designing for multiple screens.
* commit '
37191e1dc783a5558eb8ee4f096bd8350c34415d':
AndroidU lesson on designing for multiple screens.
Scott Main [Tue, 13 Dec 2011 21:10:45 +0000 (13:10 -0800)]
am
fc279e51: Merge "Created Android University lesson for Multiple APKs." into ics-mr0
* commit '
fc279e51c0bca8086b87bd49e95367c400cb61b4':
Created Android University lesson for Multiple APKs.
Scott Main [Tue, 13 Dec 2011 21:10:42 +0000 (13:10 -0800)]
am
801fda54: AndroidU lesson on designing for multiple screens.
* commit '
801fda548c719a8618e7f4cd64cad8404b0970b9':
AndroidU lesson on designing for multiple screens.
Scott Main [Tue, 13 Dec 2011 20:25:38 +0000 (12:25 -0800)]
Merge "Created Android University lesson for Multiple APKs." into ics-mr0
Andreas Huber [Tue, 13 Dec 2011 20:04:35 +0000 (12:04 -0800)]
am
22e50edd: (-s ours) am
3ab63008: Merge "DO NOT MERGE: Support for parsing of "folded" RTSP header values" into ics-mr1
* commit '
22e50edddc2a13fa9cc00f7cc5a5f6471cbece24':
DO NOT MERGE: Support for parsing of "folded" RTSP header values
Andreas Huber [Tue, 13 Dec 2011 20:01:46 +0000 (12:01 -0800)]
am
3ab63008: Merge "DO NOT MERGE: Support for parsing of "folded" RTSP header values" into ics-mr1
* commit '
3ab630084071eb5dc7f92b4a8a617f8cef10c514':
DO NOT MERGE: Support for parsing of "folded" RTSP header values
Andreas Huber [Tue, 13 Dec 2011 19:59:50 +0000 (11:59 -0800)]
Merge "DO NOT MERGE: Support for parsing of "folded" RTSP header values" into ics-mr1
Amith Yamasani [Tue, 13 Dec 2011 18:43:47 +0000 (10:43 -0800)]
Merge "Manual merge: Update VIBRATE_ON to a supported value when upgrading from GB."
Gilles Debunne [Tue, 13 Dec 2011 18:31:38 +0000 (10:31 -0800)]
Merge "Re-synced MR1 and master for SpellChecker"
Selim Gurun [Tue, 13 Dec 2011 18:25:18 +0000 (10:25 -0800)]
Merge "Move ssl callbacks to webcore thread."
Chris Craik [Tue, 13 Dec 2011 16:53:06 +0000 (08:53 -0800)]
Merge "Update tilebenchmark to work with current drawing infrastructure"
Brian Colonna [Tue, 13 Dec 2011 14:38:13 +0000 (06:38 -0800)]
Merge "Changed how Face Unlock coordinates are specified"
The Android Open Source Project [Tue, 13 Dec 2011 13:40:57 +0000 (05:40 -0800)]
am
da296533: Reconcile with ics-mr1-release
* commit '
da29653305f299d6390492333a6360cfa78665d9':
The Android Open Source Project [Tue, 13 Dec 2011 13:11:43 +0000 (05:11 -0800)]
Reconcile with ics-mr1-release
Change-Id: I96fd9c00680c7ff0e5c9fba04f8c08a31cf1cfa8
Ashish Sharma [Tue, 13 Dec 2011 08:31:53 +0000 (00:31 -0800)]
Merge "Add a command option to display installerPackageName"
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
Romain Guy [Tue, 13 Dec 2011 04:36:22 +0000 (20:36 -0800)]
Merge "Optimize state changes"
Jeff Sharkey [Tue, 13 Dec 2011 04:23:47 +0000 (20:23 -0800)]
am
f0213bf1: am
f0bbc494: Merge "Avoid NPE when missing network stats." into ics-mr1
* commit '
f0213bf1833e49744b29be97e44c3e9eaad9449d':
Avoid NPE when missing network stats.
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 03:27:36 +0000 (19:27 -0800)]
am
3f69fad9: (-s ours) am
840201d6: Merge "Update VIBRATE_ON to a supported value when upgrading from GB." into ics-mr1
* commit '
3f69fad9e958f867ceaab9c370b97959e3337c50':
Update VIBRATE_ON to a supported value when upgrading from GB.
Romain Guy [Tue, 13 Dec 2011 03:04:40 +0000 (19:04 -0800)]
Merge "Minimize the amount of data uploaded to draw text"
Romain Guy [Tue, 13 Dec 2011 03:04:32 +0000 (19:04 -0800)]
Merge "Various OpenGL optimizations"
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
Katherine Kuan [Tue, 13 Dec 2011 02:12:37 +0000 (18:12 -0800)]
Merge "Add logging to country detector logic"
Dianne Hackborn [Tue, 13 Dec 2011 02:01:26 +0000 (18:01 -0800)]
Dianne Hackborn [Tue, 13 Dec 2011 02:01:22 +0000 (18:01 -0800)]
am
2ad8a89b: am
a1279586: Merge "SDK only: now that support lib is in SDK, we can link to it." into ics-mr1
* commit '
2ad8a89b4b55f1cf8994e5b044d496d889839403':
SDK only: now that support lib is in SDK, we can link to it.
Gilles Debunne [Tue, 13 Dec 2011 01:49:31 +0000 (17:49 -0800)]
am
8e22ec9b: am
a1277de3: Merge "Prevent a memory leak in TextLine." into ics-mr1
* commit '
8e22ec9bc6c59d9e54a6b48f1133881be97af1a7':
Prevent a memory leak in TextLine.
Gilles Debunne [Tue, 13 Dec 2011 01:49:29 +0000 (17:49 -0800)]
am
7ffadba5: am
1fb90497: Merge "Text blinking cursor hard to see." into ics-mr1
* commit '
7ffadba5dfbeeaa93a9559ca3eaf1a7719426a5f':
Text blinking cursor hard to see.
Adam Powell [Tue, 13 Dec 2011 01:49:21 +0000 (17:49 -0800)]
am
bffe0be3: am
9c92fcd9: Merge "Bug
5727679 - CTS test ViewGroupTest#testGetChildVisibleRect" into ics-mr1
* commit '
bffe0be3af2bd19a392e7d332cbfda9a60b8e057':
Bug
5727679 - CTS test ViewGroupTest#testGetChildVisibleRect
Dianne Hackborn [Tue, 13 Dec 2011 01:04:04 +0000 (17:04 -0800)]
Irfan Sheriff [Tue, 13 Dec 2011 00:55:49 +0000 (16:55 -0800)]
Merge "Fix configured network status"
Romain Guy [Tue, 13 Dec 2011 00:50:55 +0000 (16:50 -0800)]
Merge "Remove leftover debugging code"
Romain Guy [Tue, 13 Dec 2011 00:49:40 +0000 (16:49 -0800)]
Merge "Keep shaders to render properly"
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.
Jamie Gennis [Tue, 13 Dec 2011 00:10:28 +0000 (16:10 -0800)]
am
74e0fcae: am
a1dee3f5: Merge "SurfaceTexture: fix a verbose-log compile error" into ics-mr1
* commit '
74e0fcaed1cd20ae8632224ff5a5404ff1a6e497':
SurfaceTexture: fix a verbose-log compile error
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
Raphael [Mon, 12 Dec 2011 23:39:30 +0000 (15:39 -0800)]
am
ab8d6785: (-s ours) am
2ace3b01: Merge "Merge "AAPT fix printf %zd crash on Windows". Do not merge." into ics-mr1
* commit '
ab8d6785dcefa5b2b66f6c042475a0f9f558dd45':
Merge "AAPT fix printf %zd crash on Windows". Do not merge.
Matthew Xie [Mon, 12 Dec 2011 23:39:27 +0000 (15:39 -0800)]
am
18ad6514: am
ed0830c5: Merge "Move broadcastState STATE_TURNING_ON before persistSwitchSetting" into ics-mr1
* commit '
18ad6514bbeb68a96c12ba1636ab8df8e3945f37':
Move broadcastState STATE_TURNING_ON before persistSwitchSetting
Eric Fischer [Mon, 12 Dec 2011 23:39:23 +0000 (15:39 -0800)]
am
f3ea0231: (-s ours) am
386f2084: Merge "Import revised translations. DO NOT MERGE" into ics-mr1
* commit '
f3ea02319fc8d1f882ef7f392c245e197ab858de':
Import revised translations. DO NOT MERGE
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
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
Robert Greenwalt [Mon, 12 Dec 2011 22:02:02 +0000 (14:02 -0800)]
Merge "Use the carrier-given dns addrs for tethering."
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.
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.
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
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.
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
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"
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
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."
OSDN Git Service
