OSDN Git Service
The Android Open Source Project [Wed, 30 May 2012 17:16:25 +0000 (10:16 -0700)]
Reconcile with jb-release
Change-Id: Ia54294c438373cc24703fc93bbd95f4b936d668a
Amith Yamasani [Wed, 30 May 2012 16:57:47 +0000 (09:57 -0700)]
am
8242901e: Merge "Adjust layout to avoid clipping." into jb-dev
* commit '
8242901e1682826137208bfe2fe35c8f50fa0be8':
Adjust layout to avoid clipping.
Amith Yamasani [Wed, 30 May 2012 16:55:45 +0000 (09:55 -0700)]
Merge "Adjust layout to avoid clipping." into jb-dev
The Android Automerger [Wed, 30 May 2012 14:05:36 +0000 (07:05 -0700)]
merge in jb-release history after reset to jb-dev
Svetoslav Ganov [Wed, 30 May 2012 03:04:43 +0000 (20:04 -0700)]
am
a99d1125: Merge "Lock screen rotation accessibility preference not updated." into jb-dev
* commit '
a99d1125e2ede99391e8cff6c4bee179fdc81d06':
Lock screen rotation accessibility preference not updated.
Svetoslav Ganov [Wed, 30 May 2012 03:02:50 +0000 (20:02 -0700)]
Merge "Lock screen rotation accessibility preference not updated." into jb-dev
Dianne Hackborn [Wed, 30 May 2012 02:13:56 +0000 (19:13 -0700)]
am
10be9eaa: Merge "Fix issue where Manage Apps would not start on correct page." into jb-dev
* commit '
10be9eaa812b38d4ad5d40afaeb05dfdf7d448b1':
Fix issue where Manage Apps would not start on correct page.
Dianne Hackborn [Wed, 30 May 2012 02:09:45 +0000 (19:09 -0700)]
Merge "Fix issue where Manage Apps would not start on correct page." into jb-dev
Jeff Brown [Wed, 30 May 2012 01:10:20 +0000 (18:10 -0700)]
am
66a55562: Merge "Make string bigger for localization." into jb-dev
* commit '
66a55562c7848d7616196238605e7970d231d22b':
Make string bigger for localization.
Jeff Brown [Wed, 30 May 2012 01:05:35 +0000 (18:05 -0700)]
Merge "Make string bigger for localization." into jb-dev
Svetoslav Ganov [Wed, 30 May 2012 00:36:48 +0000 (17:36 -0700)]
Lock screen rotation accessibility preference not updated.
1. If the lock screen rotation preference is changed from the
status bar the checkbox in the accessibility settings was
not updated.
bug:
6562028
Change-Id: I353e3ad59374ad207297d2a6682e50ed07df820c
Jeff Brown [Wed, 30 May 2012 00:26:27 +0000 (17:26 -0700)]
Make string bigger for localization.
Bug:
6575551
Change-Id: Ia13043325bc9fe28e36a0047dba5313900ab91d2
Dianne Hackborn [Wed, 30 May 2012 00:21:05 +0000 (17:21 -0700)]
Fix issue where Manage Apps would not start on correct page.
We weren't setting the correct initial page in the view
pager.
Change-Id: I68846505a4f23547e9b09e4bc06e3d455ae9556f
Jeff Sharkey [Tue, 29 May 2012 17:19:50 +0000 (10:19 -0700)]
Surface metered networks as "Mobile hotspots."
String changes to give clearer definition of metered networks, and
remove metered control for mobile network. Also fix NPE when testing
hasEthernet() before session is ready.
Bug:
6494976
Change-Id: Ia55ca3362a05977b9f21ab41eb10bbc738e29620
Amith Yamasani [Tue, 29 May 2012 22:49:29 +0000 (15:49 -0700)]
Adjust layout to avoid clipping.
Fixes the WiFi AP dialogs getting clipped at the right edge.
Bug:
6525128
Change-Id: Ic1c5c682d51e1492fe3c739c01255db886a90518
Jeff Sharkey [Tue, 29 May 2012 22:03:13 +0000 (15:03 -0700)]
am
16bf0e0e: Merge "Surface metered networks as "Mobile hotspots."" into jb-dev
* commit '
16bf0e0ec7dbd606ea5a5c8a1a9653f1cbb6d9b6':
Surface metered networks as "Mobile hotspots."
Jeff Sharkey [Tue, 29 May 2012 22:01:33 +0000 (15:01 -0700)]
Merge "Surface metered networks as "Mobile hotspots."" into jb-dev
Eric Fischer [Tue, 29 May 2012 21:37:07 +0000 (14:37 -0700)]
am
6de0ec64: Merge "Import translations. DO NOT MERGE" into jb-dev
* commit '
6de0ec640d4ddd618b7f9fa7c9fc131d13979b97':
Import translations. DO NOT MERGE
Eric Fischer [Tue, 29 May 2012 21:34:03 +0000 (14:34 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-dev
Amith Yamasani [Tue, 29 May 2012 21:16:15 +0000 (14:16 -0700)]
am
35ff41b5: Merge "Retain text in Rename Device dialog." into jb-dev
* commit '
35ff41b5f7928acaa5112051f519e3333106d239':
Retain text in Rename Device dialog.
Eric Fischer [Tue, 29 May 2012 21:15:59 +0000 (14:15 -0700)]
Import translations. DO NOT MERGE
Change-Id: I46077aeea1d55b35eddd45138c09d25bf3df4aa6
Amith Yamasani [Tue, 29 May 2012 21:13:50 +0000 (14:13 -0700)]
Merge "Retain text in Rename Device dialog." into jb-dev
Amith Yamasani [Tue, 29 May 2012 20:19:26 +0000 (13:19 -0700)]
Retain text in Rename Device dialog.
Also, show the current device name in the dialog, if available.
Bug:
6508967
Change-Id: I34d420e197796352aeab74121bdee55c2d2854d7
Jeff Sharkey [Tue, 29 May 2012 17:19:50 +0000 (10:19 -0700)]
Surface metered networks as "Mobile hotspots."
String changes to give clearer definition of metered networks, and
remove metered control for mobile network. Also fix NPE when testing
hasEthernet() before session is ready.
Bug:
6494976
Change-Id: Ia55ca3362a05977b9f21ab41eb10bbc738e29620
The Android Open Source Project [Tue, 29 May 2012 16:41:21 +0000 (09:41 -0700)]
Reconcile with jb-release nakasi-factoryrom-release
Change-Id: I96cdf547dadf2a15abbb73874390620639dae0c6
The Android Automerger [Tue, 29 May 2012 16:00:37 +0000 (09:00 -0700)]
merge in jb-release history after reset to jb-dev
Eric Fischer [Fri, 25 May 2012 22:43:45 +0000 (15:43 -0700)]
am
a56e2362: Import translations. DO NOT MERGE
* commit '
a56e2362b12cf94045145975d6ce1fa5d0c35aea':
Import translations. DO NOT MERGE
Eric Fischer [Fri, 25 May 2012 21:48:17 +0000 (14:48 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia98a540aa471fa330bfa066330d0e48e058f4798
Amith Yamasani [Fri, 25 May 2012 17:16:49 +0000 (10:16 -0700)]
am
a5ac7ce5: Merge "Don\'t show SIM LOCK settings if there\'s no Icc card." into jb-dev
* commit '
a5ac7ce5149ea3f6f4b27259cd9fd4a23b7ac47a':
Don't show SIM LOCK settings if there's no Icc card.
Amith Yamasani [Fri, 25 May 2012 17:14:58 +0000 (10:14 -0700)]
Merge "Don't show SIM LOCK settings if there's no Icc card." into jb-dev
Amith Yamasani [Fri, 25 May 2012 14:19:56 +0000 (07:19 -0700)]
am
8ad7abbc: Merge "Corrected return value for updatePreferenceToSpecificActivityOrRemove method"
* commit '
8ad7abbcf64076b4df8ff3e724815c2e7940be8e':
Corrected return value for updatePreferenceToSpecificActivityOrRemove method
Jeff Brown [Thu, 24 May 2012 22:20:21 +0000 (15:20 -0700)]
am
60111cf0: Merge "String change." into jb-dev
* commit '
60111cf073af774250517bcab0f888f91f6f4750':
String change.
Jeff Brown [Thu, 24 May 2012 22:18:16 +0000 (15:18 -0700)]
Merge "String change." into jb-dev
Jeff Brown [Thu, 24 May 2012 22:01:33 +0000 (15:01 -0700)]
String change.
Change-Id: Ic2d52977682d1074ce37df219db4c0a199d50196
Fabrice Di Meglio [Thu, 24 May 2012 18:40:30 +0000 (11:40 -0700)]
am
22af594c: Merge "Fix bug #
6522190 MountService should respond to configuration changes ("INTERNAL STORAGE" string should be translated dynamically)" into jb-dev
* commit '
22af594c04045adbb9fe6a2cb7a69e40afd655b2':
Fix bug #
6522190 MountService should respond to configuration changes ("INTERNAL STORAGE" string should be translated dynamically)
Fabrice Di Meglio [Thu, 24 May 2012 18:37:07 +0000 (11:37 -0700)]
Merge "Fix bug #
6522190 MountService should respond to configuration changes ("INTERNAL STORAGE" string should be translated dynamically)" into jb-dev
Fabrice Di Meglio [Thu, 24 May 2012 18:35:09 +0000 (11:35 -0700)]
Fix bug #
6522190 MountService should respond to configuration changes ("INTERNAL STORAGE" string should be translated dynamically)
- use an ID instead of a String for StorageVolume description
- use this ID for getting the correct localized version of the description string
Change-Id: If66868ecc84297322cb9a3f0b2d834f79dd019ca
Jeff Sharkey [Thu, 24 May 2012 18:28:17 +0000 (11:28 -0700)]
am
a655a2f4: Merge "Only show ethernet when traffic has occurred." into jb-dev
* commit '
a655a2f48e61dd44ee9f14585e0ee89202412158':
Only show ethernet when traffic has occurred.
Jeff Sharkey [Thu, 24 May 2012 18:25:55 +0000 (11:25 -0700)]
Merge "Only show ethernet when traffic has occurred." into jb-dev
Jeff Sharkey [Thu, 24 May 2012 18:01:29 +0000 (11:01 -0700)]
Only show ethernet when traffic has occurred.
Bug:
6231172
Change-Id: I24dfd5f998b4e96681813c9fd7ce1ed74cf30eb5
The Android Automerger [Thu, 24 May 2012 17:19:40 +0000 (10:19 -0700)]
merge in nakasi-factoryrom-release history after reset to jb-dev
Amith Yamasani [Thu, 24 May 2012 16:48:20 +0000 (09:48 -0700)]
Merge "Corrected return value for updatePreferenceToSpecificActivityOrRemove method"
The Android Open Source Project [Thu, 24 May 2012 16:01:44 +0000 (09:01 -0700)]
Reconcile with jb-release nakasi-factoryrom-release
Change-Id: I50829094e89eb701667f355ffe86ef812c5aa0cc
The Android Automerger [Thu, 24 May 2012 14:01:56 +0000 (07:01 -0700)]
merge in jb-release history after reset to jb-dev
Michael Kolb [Wed, 23 May 2012 17:26:53 +0000 (10:26 -0700)]
Match setup wizard wifi settings with new wireframes
Bug:
6521472
Change-Id: I159d8a98327ad775b2c5ccfc7380d60d62b54dad
Amith Yamasani [Wed, 23 May 2012 22:42:46 +0000 (15:42 -0700)]
Don't show SIM LOCK settings if there's no Icc card.
Bug:
6525359
Change-Id: I7bf2a1799ca3032a5dbfa15320d862195b9659f7
Amith Yamasani [Wed, 23 May 2012 21:36:50 +0000 (14:36 -0700)]
am
6e9e5195: Merge "Fix crash when removing an account." into jb-dev
* commit '
6e9e519560a50d735ea3c2ddd01d9b7a9cc1d89b':
Fix crash when removing an account.
Amith Yamasani [Wed, 23 May 2012 21:34:15 +0000 (14:34 -0700)]
Merge "Fix crash when removing an account." into jb-dev
Amith Yamasani [Wed, 23 May 2012 21:13:13 +0000 (14:13 -0700)]
Fix crash when removing an account.
Bug:
6494527
Change-Id: I9ab3b54ac4e4d679fd9ec22ab438b9e1ea0be2b1
Christian Robertson [Wed, 23 May 2012 21:04:40 +0000 (14:04 -0700)]
am
27c20291: Merge "Updating launcher icon to fix alignment. Bug:
6511716" into jb-dev
* commit '
27c2029128d2d9909eced0bb7d7c56755d85de17':
Updating launcher icon to fix alignment. Bug:
6511716
Christian Robertson [Wed, 23 May 2012 21:01:46 +0000 (14:01 -0700)]
Merge "Updating launcher icon to fix alignment. Bug:
6511716" into jb-dev
Christian Robertson [Wed, 23 May 2012 18:59:53 +0000 (11:59 -0700)]
Updating launcher icon to fix alignment. Bug:
6511716
Change-Id: I912c356fcd61414394ef9318568491b68a63b724
Michael Kolb [Wed, 23 May 2012 18:31:51 +0000 (11:31 -0700)]
am
9d5a6eb4: Match setup wizard wifi settings with new wireframes
* commit '
9d5a6eb4d7ec662e666dc5dfe1506616d5b59341':
Match setup wizard wifi settings with new wireframes
Michael Kolb [Wed, 23 May 2012 17:26:53 +0000 (10:26 -0700)]
Match setup wizard wifi settings with new wireframes
Bug:
6521472
Change-Id: I159d8a98327ad775b2c5ccfc7380d60d62b54dad
The Android Automerger [Wed, 23 May 2012 14:04:18 +0000 (07:04 -0700)]
merge in jb-release history after reset to jb-dev
John Spurlock [Wed, 23 May 2012 12:39:01 +0000 (05:39 -0700)]
am
3a821e86: Merge "Settings: "Rotation lock" retains existing orientation." into jb-dev
* commit '
3a821e86f5851cbce1185a481acb88a0f33c98ae':
Settings: "Rotation lock" retains existing orientation.
John Spurlock [Wed, 23 May 2012 12:29:56 +0000 (05:29 -0700)]
Merge "Settings: "Rotation lock" retains existing orientation." into jb-dev
Vikram Aggarwal [Tue, 22 May 2012 21:52:40 +0000 (14:52 -0700)]
am
ff78bf72: Merge "Show keyboard selectively, do not listen on MCC/MNC changes, show text to user." into jb-dev
* commit '
ff78bf7280b2f435bf09e0df0f252506b1c6af61':
Show keyboard selectively, do not listen on MCC/MNC changes, show text to user.
Vikram Aggarwal [Tue, 22 May 2012 21:50:48 +0000 (14:50 -0700)]
Merge "Show keyboard selectively, do not listen on MCC/MNC changes, show text to user." into jb-dev
Vikram Aggarwal [Tue, 22 May 2012 17:58:10 +0000 (10:58 -0700)]
Show keyboard selectively, do not listen on MCC/MNC changes, show text to user.
Fix b/
6531158 (Stop showing the keyboard)
Fix b/
6532201 (Stop removing the text view, and prompt the user with a message)
Fix b/
6155075 (Stop listening to MCC/MNC changes)
Change-Id: Ibf8414fe57bdd0acf6c20f3194c52b168b9292c6
The Android Automerger [Tue, 22 May 2012 20:25:42 +0000 (13:25 -0700)]
merge in nakasi-factoryrom-release history after reset to jb-dev
The Android Open Source Project [Tue, 22 May 2012 20:06:55 +0000 (13:06 -0700)]
Reconcile with jb-release
Change-Id: Iceaefeeee355a1ceb5c38751649e375f5c52bd7c
Andrew Flynn [Tue, 22 May 2012 18:41:21 +0000 (11:41 -0700)]
am
be4a0325: Merge "Update WPS Dialog" into jb-dev
* commit '
be4a032581ae6dfb41662486085e64052d085314':
Update WPS Dialog
Andrew Flynn [Tue, 22 May 2012 18:39:30 +0000 (11:39 -0700)]
Merge "Update WPS Dialog" into jb-dev
Andrew Flynn [Tue, 22 May 2012 17:54:54 +0000 (10:54 -0700)]
Update WPS Dialog
- Remove title
- Change description text
- Add WPS icon
Bug:
6457246
Change-Id: Icd37261dd3ce920b3bed359ed5232bdc018916fc
Andrew Flynn [Tue, 22 May 2012 18:05:54 +0000 (11:05 -0700)]
am
115ae0cf: Change wifi-on-but-no-networks string
* commit '
115ae0cf0119c07fa8e255df6acf8077282854c6':
Change wifi-on-but-no-networks string
Andrew Flynn [Tue, 22 May 2012 16:44:51 +0000 (09:44 -0700)]
Change wifi-on-but-no-networks string
Bug:
6533206
Change-Id: I4f5c1d77ffe1bf93c33c9b65f9fdc7278864f88f
Jean-Baptiste Queru [Tue, 22 May 2012 15:52:27 +0000 (08:52 -0700)]
am
1a47dff3: Merge "Remove title bar background drawable from running app detail view"
* commit '
1a47dff3ceeb45a97d08f58f19bfcf7becf145d4':
Remove title bar background drawable from running app detail view
Jean-Baptiste Queru [Tue, 22 May 2012 14:48:40 +0000 (07:48 -0700)]
Merge "Remove title bar background drawable from running app detail view"
The Android Automerger [Tue, 22 May 2012 14:07:04 +0000 (07:07 -0700)]
merge in jb-release history after reset to jb-dev
John Spurlock [Tue, 22 May 2012 13:51:02 +0000 (09:51 -0400)]
Settings: "Rotation lock" retains existing orientation.
Enabling "Rotation lock" when in landscape will stay in landscape
instead of forcing to portrait.
Bug:
6481542
Change-Id: Ide6171437a207f97a8fc3123ad8b2fe27323336f
alanv [Tue, 22 May 2012 01:29:40 +0000 (18:29 -0700)]
am
0aa7c4f1: Fixed all Accessibility lint warnings in Settings app.
* commit '
0aa7c4f14169c95d203ed996ff6eed3981818c6c':
Fixed all Accessibility lint warnings in Settings app.
alanv [Tue, 22 May 2012 00:55:19 +0000 (17:55 -0700)]
Fixed all Accessibility lint warnings in Settings app.
Change-Id: Ida98444f8942d3618d84c0a6f78cc3653ea4ad24
Adam Powell [Mon, 21 May 2012 23:04:06 +0000 (16:04 -0700)]
am
0901a3c2: Merge "Update the All Apps PagerTabStrip text appearance." into jb-dev
* commit '
0901a3c2132cb439fbab64d13cbe9ede0e5e5379':
Update the All Apps PagerTabStrip text appearance.
Adam Powell [Mon, 21 May 2012 23:02:04 +0000 (16:02 -0700)]
Merge "Update the All Apps PagerTabStrip text appearance." into jb-dev
Adam Powell [Mon, 21 May 2012 21:18:49 +0000 (14:18 -0700)]
Update the All Apps PagerTabStrip text appearance.
Change-Id: I5f6b924d0a291b0723b76ee024bc87cb69d61893
Svetoslav Ganov [Mon, 21 May 2012 21:12:43 +0000 (14:12 -0700)]
am
8d43aeae: Merge "Updating the checkbox state to match the title." into jb-dev
* commit '
8d43aeae0347435a03e4007eef5fce578ec50184':
Updating the checkbox state to match the title.
Svetoslav Ganov [Mon, 21 May 2012 21:09:27 +0000 (14:09 -0700)]
Merge "Updating the checkbox state to match the title." into jb-dev
Jean-Baptiste Queru [Mon, 21 May 2012 19:36:49 +0000 (12:36 -0700)]
am
c0653a12: Merge "Expandable NumberPicker width in bytesPicker dialog"
* commit '
c0653a12304d64aa6107b2f06bb6d0e2e73a2c33':
Expandable NumberPicker width in bytesPicker dialog
Jean-Baptiste Queru [Mon, 21 May 2012 18:37:30 +0000 (11:37 -0700)]
Merge "Expandable NumberPicker width in bytesPicker dialog"
The Android Automerger [Mon, 21 May 2012 14:06:07 +0000 (07:06 -0700)]
merge in jb-release history after reset to jb-dev
Jeff Brown [Mon, 21 May 2012 04:53:26 +0000 (21:53 -0700)]
am
766b2861: Add UI to select multiple keyboard layouts.
* commit '
766b286187d02b3da6e0142376a4478072f30a16':
Add UI to select multiple keyboard layouts.
Jeff Brown [Fri, 18 May 2012 22:04:45 +0000 (15:04 -0700)]
Add UI to select multiple keyboard layouts.
Bug:
6405203
Change-Id: I27ca4630aebcb39b83298d37d8fb3f4ef0080317
The Android Automerger [Sun, 20 May 2012 14:39:53 +0000 (07:39 -0700)]
merge in jb-release history after reset to jb-dev
The Android Open Source Project [Sat, 19 May 2012 01:44:06 +0000 (18:44 -0700)]
Reconcile with jb-release nakasi-factoryrom-release
Change-Id: Ibc7ab1d501b3fd26d83a26a8daec7a01eb6f9030
Svetoslav Ganov [Sat, 19 May 2012 01:00:24 +0000 (18:00 -0700)]
Updating the checkbox state to match the title.
1. Now the the setting is names lock screen rotation
which is the opposite as it was before so this
patch reverses the checkbox state.
bug:
6507335
Change-Id: Ic0aab21fa70871f64e37ac05f7917d69f9c0a0df
Svetoslav Ganov [Fri, 18 May 2012 22:59:23 +0000 (15:59 -0700)]
am
fc16237d: Merge "Removed Accessibility tutorial and orphaned resources." into jb-dev
* commit '
fc16237d5debc7375be1d485e510df2156d8da0f':
Removed Accessibility tutorial and orphaned resources.
Irfan Sheriff [Fri, 18 May 2012 22:59:22 +0000 (15:59 -0700)]
am
ee7589c0: Merge "Fix p2p settings crash" into jb-dev
* commit '
ee7589c02ab2cf4a4169531df54595f81f0d88a0':
Fix p2p settings crash
Svetoslav Ganov [Fri, 18 May 2012 22:21:23 +0000 (15:21 -0700)]
Merge "Removed Accessibility tutorial and orphaned resources." into jb-dev
Irfan Sheriff [Fri, 18 May 2012 22:10:41 +0000 (15:10 -0700)]
Merge "Fix p2p settings crash" into jb-dev
Jeff Sharkey [Fri, 18 May 2012 21:00:10 +0000 (14:00 -0700)]
Avoid NPE until we understand better.
Bug:
6450986
Change-Id: I68af8fedc419cd3142ba2bb7530b77aca7718123
Michael Kolb [Fri, 18 May 2012 17:54:31 +0000 (10:54 -0700)]
Add seperate activity for setup wizard wifi picker to adjust theme
Bug:
6517721
Change-Id: I639122435161cd4816b82ab73f91ebbcd2df027e
Dianne Hackborn [Fri, 18 May 2012 01:05:17 +0000 (18:05 -0700)]
Fix issues
6512411 and
6512951 in ManageApplications.
6512411 java.lang.IndexOutOfBoundsException: Invalid index 0, size is 0
6512951 Settings crash while returning from App info screen
Also fix padding around the UI, and display of storage use.
Change-Id: Ibfcfe1a4a80f25f81ba2cabbb2e3d60aaa9ac04e
alanv [Fri, 18 May 2012 21:28:53 +0000 (14:28 -0700)]
Removed Accessibility tutorial and orphaned resources.
Change-Id: Ic96e002b04bed4c525fe959a3ad7e55d8709c75f
Jeff Sharkey [Fri, 18 May 2012 21:21:40 +0000 (14:21 -0700)]
am
409433e9: Merge "Avoid NPE until we understand better." into jb-dev
* commit '
409433e904f9b8a65a87274b7d5f582f0ac46e26':
Avoid NPE until we understand better.
Svetoslav Ganov [Fri, 18 May 2012 21:21:39 +0000 (14:21 -0700)]
am
6a09c07b: Merge "Removing explore by touch from settings." into jb-dev
* commit '
6a09c07b20e2a99a86882ecb8c30ee35f6c6f4ca':
Removing explore by touch from settings.
Michael Kolb [Fri, 18 May 2012 21:21:38 +0000 (14:21 -0700)]
am
5dfc5053: Merge "Add seperate activity for setup wizard wifi picker to adjust theme" into jb-dev
* commit '
5dfc505301f70de24adf0724fb270ab3d5b5cd9b':
Add seperate activity for setup wizard wifi picker to adjust theme
Jeff Sharkey [Fri, 18 May 2012 21:05:25 +0000 (14:05 -0700)]
Merge "Avoid NPE until we understand better." into jb-dev
Jeff Sharkey [Fri, 18 May 2012 21:00:10 +0000 (14:00 -0700)]
Avoid NPE until we understand better.
Bug:
6450986
Change-Id: I68af8fedc419cd3142ba2bb7530b77aca7718123
Svetoslav Ganov [Fri, 18 May 2012 20:50:37 +0000 (13:50 -0700)]
Merge "Removing explore by touch from settings." into jb-dev