Merge "Fix accidental creation of restriction entry for required apps"
Fix accidental creation of restriction entry for required apps

When entering Settings->Restrictions, don't automatically query restriction entries
for required apps.

Bug: 9681399
Change-Id: Idcc773bf4793b3e7e2b328a15881b7ecf930c6c3
Add the edit text style for tablets to fix layout issue

Bug: 9556589
Change-Id: If9443b2ce10782aeb266e87fbeafa74e158121cd
Update to show new location monitoring op.

Change-Id: I921e95327c743c5b9b89bfe5a94beca67bfdb7de
merge in klp-release history after reset to master
Add developer option for switching between Dalvik and ART

Change-Id: Ia5a8649e52b607b31429fca258a8fdf62217426c
Use InputMethodUtils in input method settings

Change-Id: Ifd054c86b7099db3984e559feb5fadf1df5ca227
Merge "Update to show new location monitoring op."
Merge "Use InputMethodUtils in input method settings"
Fix issue 52986: Wifi settings abnormal when screen rotation

When checked "Show Advanced settings" in wifi setup wifi setup wizard, and rotate the phone to landscape, the advanced settings are gone, but the checkbox is still checked. It's because of checkbox is set click listener but not checked changed listener, it can't handle checkbox's status properly.

Change-Id: I2930cab4d0878c3d91db46560f837ca21d45da4d
Import translations. DO NOT MERGE

Change-Id: I6b02734b2ef1396af16da6e8102cdbb6ca79a50c
Auto-generated-cl: translation import
Import translations. DO NOT MERGE

Change-Id: I8112e19acd0d8d12b5435d467c40e9b93162fca8
Auto-generated-cl: translation import
Import translations. DO NOT MERGE

Change-Id: I29410b46882d22f35d29bb82bcbffeab31aa11ee
Auto-generated-cl: translation import
VZW wants the phoneNumber to be 10 zero's if there isn't one.

Bug: 9784059
Change-Id: I41bba908855648d2560440655d8a75a7cb2e0859
merge in klp-release history after reset to master
am eddcf88e: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge

* commit 'eddcf88e64f353be6a85f900e9443583adfe3a65':
am 2a1ccab1: Import translations. DO NOT MERGE

* commit '2a1ccab1cdd00af6989eadba1a766120d0b10243':
  Import translations. DO NOT MERGE
am 9598002a: am 2a1ccab1: Import translations. DO NOT MERGE

* commit '9598002ab582ca05a5ca1c3b15c8a9d5bbaee2a1':
  Import translations. DO NOT MERGE
am db4cfb0c: (-s ours) am 9598002a: am 2a1ccab1: Import translations. DO NOT MERGE

* commit 'db4cfb0c85c19451fbf1a07acc629e4caea36120':
  Import translations. DO NOT MERGE
Merge "Import translations. DO NOT MERGE" into jb-mr2-ub-dev