Commit Graph

10811 Commits

Author SHA1 Message Date
Baligh Uddin
8e3405d85a am f6d197a7: (-s ours) am 613cab12: am f9d69170: Import translations. DO NOT MERGE
* commit 'f6d197a75930cfba096c4983c4f27a10158536fa':
  Import translations. DO NOT MERGE
2013-07-15 19:46:48 -07:00
Baligh Uddin
f6d197a759 am 613cab12: am f9d69170: Import translations. DO NOT MERGE
* commit '613cab12188b59b907834d6e8e473219ba6306a8':
  Import translations. DO NOT MERGE
2013-07-15 19:44:11 -07:00
Baligh Uddin
508165e3aa am 48fa42b5: (-s ours) am 3f573fae: Import translations. DO NOT MERGE
* commit '48fa42b58bd46c9f424b249827ae68beeb54c49b':
  Import translations. DO NOT MERGE
2013-07-15 19:42:24 -07:00
Baligh Uddin
48fa42b58b am 3f573fae: Import translations. DO NOT MERGE
* commit '3f573faef91c31198f95730614fad751b7cdc8f1':
  Import translations. DO NOT MERGE
2013-07-15 19:40:53 -07:00
Baligh Uddin
613cab1218 am f9d69170: Import translations. DO NOT MERGE
* commit 'f9d691707c2acfa5808d3f7b14ec520e24c9e8c6':
  Import translations. DO NOT MERGE
2013-07-15 19:40:53 -07:00
Baligh Uddin
f462cd6d8e Merge "Import translations. DO NOT MERGE" 2013-07-16 02:39:06 +00:00
Amith Yamasani
12d2d812a3 Merge "Potential fix for Settings instability on x-large." 2013-07-15 22:36:49 +00:00
Amith Yamasani
6cb5630c17 Potential fix for Settings instability on x-large.
Bug: 9752185
Change-Id: I1b2af6661a601e1d487a35a53f5d01e58529a34d
2013-07-15 15:35:29 -07:00
Baligh Uddin
3ac8cb4916 Import translations. DO NOT MERGE
Change-Id: Iea816bd3e1110127bc01ea2beacc0071ed42ed24
Auto-generated-cl: translation import
2013-07-15 11:41:29 -07:00
Baligh Uddin
3f573faef9 Import translations. DO NOT MERGE
Change-Id: I5ed3429648c82e9a2cf4ca62f308639371bcfdde
Auto-generated-cl: translation import
2013-07-15 11:38:16 -07:00
Baligh Uddin
f9d691707c Import translations. DO NOT MERGE
Change-Id: I0f107b738c6aa5f0aeb538ccf991f64fac47fd5c
Auto-generated-cl: translation import
2013-07-15 11:36:58 -07:00
The Android Open Source Project
09fb2a55d9 am f2d9e68c: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
* commit 'f2d9e68c238d754d00fa846b4d4c6737a24595fc':
2013-07-15 09:37:51 -07:00
The Android Open Source Project
f2d9e68c23 Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: Id0cd5164aa3d404463c520c3361cce521f3577fe
2013-07-15 09:33:36 -07:00
The Android Automerger
d9575910e7 merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev 2013-07-15 08:19:20 -07:00
Wink Saville
5c2075037d am eeb90735: am 95c2a4a4: am 80bfbd53: Merge "VZW wants the phoneNumber to be 10 zero\'s if there isn\'t one." into jb-mr2-dev
* commit 'eeb90735dd7accfa34d77bcc8023412dab84bf9d':
  VZW wants the phoneNumber to be 10 zero's if there isn't one.
2013-07-12 12:14:02 -07:00
Wink Saville
eeb90735dd am 95c2a4a4: am 80bfbd53: Merge "VZW wants the phoneNumber to be 10 zero\'s if there isn\'t one." into jb-mr2-dev
* commit '95c2a4a43039705f573b346026908369aa5df2b6':
  VZW wants the phoneNumber to be 10 zero's if there isn't one.
2013-07-12 12:03:54 -07:00
Wink Saville
95c2a4a430 am 80bfbd53: Merge "VZW wants the phoneNumber to be 10 zero\'s if there isn\'t one." into jb-mr2-dev
* commit '80bfbd53151eccb8888aafc81d3dccea87cdca29':
  VZW wants the phoneNumber to be 10 zero's if there isn't one.
2013-07-12 12:01:43 -07:00
Wink Saville
80bfbd5315 Merge "VZW wants the phoneNumber to be 10 zero's if there isn't one." into jb-mr2-dev 2013-07-12 18:58:56 +00:00
Baligh Uddin
a1d0ba00cd am 9d41a551: (-s ours) am 5ecc395e: Merge "Import translations. DO NOT MERGE" into jb-mr2-ub-dev
* commit '9d41a551e5ceb23afb21db818626a5b377f410a9':
  Import translations. DO NOT MERGE
2013-07-11 14:55:01 -07:00
Baligh Uddin
9d41a551e5 am 5ecc395e: Merge "Import translations. DO NOT MERGE" into jb-mr2-ub-dev
* commit '5ecc395ef2c96f899b396e937be97cc597775d8a':
  Import translations. DO NOT MERGE
2013-07-11 14:52:27 -07:00
Baligh Uddin
420b092904 Merge "Import translations. DO NOT MERGE" 2013-07-11 21:51:49 +00:00
Baligh Uddin
5ecc395ef2 Merge "Import translations. DO NOT MERGE" into jb-mr2-ub-dev 2013-07-11 21:50:16 +00:00
Baligh Uddin
ef77714f7d am db4cfb0c: (-s ours) am 9598002a: am 2a1ccab1: Import translations. DO NOT MERGE
* commit 'db4cfb0c85c19451fbf1a07acc629e4caea36120':
  Import translations. DO NOT MERGE
2013-07-11 14:23:43 -07:00
Baligh Uddin
db4cfb0c85 am 9598002a: am 2a1ccab1: Import translations. DO NOT MERGE
* commit '9598002ab582ca05a5ca1c3b15c8a9d5bbaee2a1':
  Import translations. DO NOT MERGE
2013-07-11 12:25:42 -07:00
Baligh Uddin
9598002ab5 am 2a1ccab1: Import translations. DO NOT MERGE
* commit '2a1ccab1cdd00af6989eadba1a766120d0b10243':
  Import translations. DO NOT MERGE
2013-07-11 12:23:19 -07:00
The Android Open Source Project
26504996ec am eddcf88e: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
* commit 'eddcf88e64f353be6a85f900e9443583adfe3a65':
2013-07-11 08:08:04 -07:00
Wink Saville
b464478664 VZW wants the phoneNumber to be 10 zero's if there isn't one.
Bug: 9784059
Change-Id: I41bba908855648d2560440655d8a75a7cb2e0859
2013-07-10 22:19:26 -07:00
Baligh Uddin
a38fac3b8d Import translations. DO NOT MERGE
Change-Id: I29410b46882d22f35d29bb82bcbffeab31aa11ee
Auto-generated-cl: translation import
2013-07-10 20:33:24 -07:00
Baligh Uddin
7c992b80cf Import translations. DO NOT MERGE
Change-Id: I8112e19acd0d8d12b5435d467c40e9b93162fca8
Auto-generated-cl: translation import
2013-07-10 20:30:12 -07:00
Baligh Uddin
2a1ccab1cd Import translations. DO NOT MERGE
Change-Id: I6b02734b2ef1396af16da6e8102cdbb6ca79a50c
Auto-generated-cl: translation import
2013-07-10 20:28:57 -07:00
Satoshi Kataoka
bc453345ce Merge "Use InputMethodUtils in input method settings" 2013-07-11 03:04:28 +00:00
Dianne Hackborn
1dd1a9363f Merge "Update to show new location monitoring op." 2013-07-10 18:46:04 +00:00
Satoshi Kataoka
1ecdb22b4e Use InputMethodUtils in input method settings
Change-Id: Ifd054c86b7099db3984e559feb5fadf1df5ca227
2013-07-11 02:20:04 +09:00
Brian Carlstrom
f32ba13a76 Add developer option for switching between Dalvik and ART
Change-Id: Ia5a8649e52b607b31429fca258a8fdf62217426c
2013-07-10 09:49:07 -07:00
Dianne Hackborn
15ab7758df Update to show new location monitoring op.
Change-Id: I921e95327c743c5b9b89bfe5a94beca67bfdb7de
2013-07-09 18:50:44 -07:00
Amith Yamasani
9333cc7de5 Add the edit text style for tablets to fix layout issue
Bug: 9556589
Change-Id: If9443b2ce10782aeb266e87fbeafa74e158121cd
2013-07-09 17:06:58 -07:00
Amith Yamasani
95b4cb5765 Merge "Fix accidental creation of restriction entry for required apps" 2013-07-09 18:33:55 +00:00
Amith Yamasani
9e9c77c130 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
2013-07-09 11:28:40 -07:00
The Android Open Source Project
eddcf88e64 Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: Ib1fa3361941e032e0ff6137b37ef14eee2e794b2
2013-07-09 09:37:51 -07:00
The Android Automerger
ceea6ac47e merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev 2013-07-09 05:55:36 -07:00
The Android Open Source Project
f9ee312b4e am ff2b0d7f: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
* commit 'ff2b0d7f79283665ad3d1fee8a96b3455be7f91d':
2013-07-08 15:48:50 -07:00
The Android Open Source Project
ff2b0d7f79 Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: I5b0a5ed28f84d9e080f30feeec05975512a8b8f7
2013-07-08 15:37:19 -07:00
Baligh Uddin
c541fcbf60 am 18119223: (-s ours) am 55077df1: am f1d02056: Import translations. DO NOT MERGE
* commit '181192235d02e647a161a18ff442367ca8fe7f8f':
  Import translations. DO NOT MERGE
2013-07-08 14:40:59 -07:00
Baligh Uddin
82a1d34e6c am 369ca5a7: (-s ours) am 20a554fa: Import translations. DO NOT MERGE
* commit '369ca5a7b07963a77ab2f7c323a552d2c247b401':
  Import translations. DO NOT MERGE
2013-07-08 14:40:58 -07:00
Baligh Uddin
181192235d am 55077df1: am f1d02056: Import translations. DO NOT MERGE
* commit '55077df18a9bc29171eeb1587ec6c84101e6fa64':
  Import translations. DO NOT MERGE
2013-07-08 14:38:21 -07:00
Baligh Uddin
369ca5a7b0 am 20a554fa: Import translations. DO NOT MERGE
* commit '20a554fa50620fc51951a12f16a27f83168f4ce3':
  Import translations. DO NOT MERGE
2013-07-08 14:38:18 -07:00
Baligh Uddin
55077df18a am f1d02056: Import translations. DO NOT MERGE
* commit 'f1d02056d967b2660424f181ce547b846a92fdec':
  Import translations. DO NOT MERGE
2013-07-08 14:35:21 -07:00
Baligh Uddin
12c8b64cdc Import translations. DO NOT MERGE
Change-Id: I4f9e9eb6205bd1f638de95696b63e0fb9ec42e83
Auto-generated-cl: translation import
2013-07-08 09:22:36 -07:00
Baligh Uddin
20a554fa50 Import translations. DO NOT MERGE
Change-Id: I5abf06c94c0aa4a90a11b0a14fe6f04ec6d003c9
Auto-generated-cl: translation import
2013-07-08 09:18:57 -07:00
Baligh Uddin
f1d02056d9 Import translations. DO NOT MERGE
Change-Id: I7d34201de76770bcb6a1998c6d898830ca290006
Auto-generated-cl: translation import
2013-07-08 09:17:21 -07:00