OSDN Git Service
The Android Open Source Project [Fri, 19 Jul 2013 23:02:29 +0000 (16:02 -0700)]
am
58311f90: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
* commit '
58311f908300bff0174f84d06116225c5d985107':
Use ConnectivityManager for mobile provision url
Robert Greenwalt [Fri, 19 Jul 2013 23:02:13 +0000 (16:02 -0700)]
am
ea6b5d63: am
275c1dff: am
3c087a68: Merge "Use ConnectivityManager for mobile provision url" into jb-mr2-dev
* commit '
ea6b5d63d9100f014cdedf438f1750ed65b822b2':
Use ConnectivityManager for mobile provision url
Baligh Uddin [Fri, 19 Jul 2013 22:14:26 +0000 (22:14 +0000)]
Merge "Import translations. DO NOT MERGE"
The Android Open Source Project [Fri, 19 Jul 2013 21:21:02 +0000 (14:21 -0700)]
Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: I54f669254cc0552c2f0492d799f977854eed409b
Robert Greenwalt [Fri, 19 Jul 2013 20:43:04 +0000 (13:43 -0700)]
am
275c1dff: am
3c087a68: Merge "Use ConnectivityManager for mobile provision url" into jb-mr2-dev
* commit '
275c1dff7dbec58588b0c696fc5ff4dc80ca6942':
Use ConnectivityManager for mobile provision url
Robert Greenwalt [Fri, 19 Jul 2013 20:33:33 +0000 (13:33 -0700)]
am
3c087a68: Merge "Use ConnectivityManager for mobile provision url" into jb-mr2-dev
* commit '
3c087a68f6e627f48eb0cea2dfbf21b47d3ab24a':
Use ConnectivityManager for mobile provision url
Amith Yamasani [Fri, 19 Jul 2013 20:21:35 +0000 (13:21 -0700)]
Remove spurious import
Change-Id: I91172626f4ec64c0fc7497f9f7d11244ca49a341
Amith Yamasani [Fri, 19 Jul 2013 19:49:16 +0000 (19:49 +0000)]
Merge "Apply restrictions right away instead of on exit"
Robert Greenwalt [Fri, 19 Jul 2013 04:16:01 +0000 (21:16 -0700)]
am
ba32c249: resolved conflicts for merge of
4d9f670b to stage-aosp-master
* commit '
ba32c249addded770c288771748aa25d554352a0':
Fix issue 52986: Wifi settings abnormal when screen rotation
Robert Greenwalt [Fri, 19 Jul 2013 03:52:47 +0000 (20:52 -0700)]
resolved conflicts for merge of
4d9f670b to stage-aosp-master
Change-Id: Ia5bb368dbbd857c6e201b821ae7c03a9f6f5006b
Robert Greenwalt [Fri, 19 Jul 2013 00:17:42 +0000 (00:17 +0000)]
Merge "Fix issue 52986: Wifi settings abnormal when screen rotation"
Baligh Uddin [Thu, 18 Jul 2013 21:35:25 +0000 (14:35 -0700)]
Import translations. DO NOT MERGE
Change-Id: I36ca8a984f864c080cda8f14bab6fa63b3781e68
Auto-generated-cl: translation import
Amith Yamasani [Tue, 2 Jul 2013 21:15:29 +0000 (14:15 -0700)]
Apply restrictions right away instead of on exit
Use usermanager to clear restrictions, as it needs to do a bunch of
book keeping.
Apply PIN restriction to master clear button.
Changing existing PIN now includes verifying the PIN, so it doesn't
need to be cleared here in Settings.
Removed automatic persisting of restrictions on receiving them unless
it is a restricted profile.
Make apps that are signed with platform certs immutable and ON.
Change-Id: Iffd1bf2eb0d18202fb66ddcf80668baa8e6b84ed
Robert Greenwalt [Tue, 16 Jul 2013 20:09:24 +0000 (13:09 -0700)]
Use ConnectivityManager for mobile provision url
bug:
9623159
Change-Id: I36697ed341353b7a3dbec5afe20241102e76f6f1
Robert Greenwalt [Wed, 17 Jul 2013 23:47:01 +0000 (23:47 +0000)]
Merge "Use ConnectivityManager for mobile provision url" into jb-mr2-dev
Robert Greenwalt [Tue, 16 Jul 2013 20:09:24 +0000 (13:09 -0700)]
Use ConnectivityManager for mobile provision url
bug:
9623159
Change-Id: I36697ed341353b7a3dbec5afe20241102e76f6f1
Baligh Uddin [Tue, 16 Jul 2013 02:46:48 +0000 (19:46 -0700)]
am
f6d197a7: (-s ours) am
613cab12: am
f9d69170: Import translations. DO NOT MERGE
* commit '
f6d197a75930cfba096c4983c4f27a10158536fa':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 16 Jul 2013 02:44:11 +0000 (19:44 -0700)]
am
613cab12: am
f9d69170: Import translations. DO NOT MERGE
* commit '
613cab12188b59b907834d6e8e473219ba6306a8':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 16 Jul 2013 02:42:24 +0000 (19:42 -0700)]
am
48fa42b5: (-s ours) am
3f573fae: Import translations. DO NOT MERGE
* commit '
48fa42b58bd46c9f424b249827ae68beeb54c49b':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 16 Jul 2013 02:40:53 +0000 (19:40 -0700)]
am
f9d69170: Import translations. DO NOT MERGE
* commit '
f9d691707c2acfa5808d3f7b14ec520e24c9e8c6':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 16 Jul 2013 02:40:53 +0000 (19:40 -0700)]
am
3f573fae: Import translations. DO NOT MERGE
* commit '
3f573faef91c31198f95730614fad751b7cdc8f1':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 16 Jul 2013 02:39:06 +0000 (02:39 +0000)]
Merge "Import translations. DO NOT MERGE"
Amith Yamasani [Mon, 15 Jul 2013 22:36:49 +0000 (22:36 +0000)]
Merge "Potential fix for Settings instability on x-large."
Amith Yamasani [Mon, 15 Jul 2013 22:35:29 +0000 (15:35 -0700)]
Potential fix for Settings instability on x-large.
Bug:
9752185
Change-Id: I1b2af6661a601e1d487a35a53f5d01e58529a34d
Baligh Uddin [Mon, 15 Jul 2013 18:41:29 +0000 (11:41 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iea816bd3e1110127bc01ea2beacc0071ed42ed24
Auto-generated-cl: translation import
Baligh Uddin [Mon, 15 Jul 2013 18:38:16 +0000 (11:38 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5ed3429648c82e9a2cf4ca62f308639371bcfdde
Auto-generated-cl: translation import
Baligh Uddin [Mon, 15 Jul 2013 18:36:58 +0000 (11:36 -0700)]
Import translations. DO NOT MERGE
Change-Id: I0f107b738c6aa5f0aeb538ccf991f64fac47fd5c
Auto-generated-cl: translation import
The Android Open Source Project [Mon, 15 Jul 2013 16:37:51 +0000 (09:37 -0700)]
am
f2d9e68c: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
* commit '
f2d9e68c238d754d00fa846b4d4c6737a24595fc':
The Android Open Source Project [Mon, 15 Jul 2013 16:33:36 +0000 (09:33 -0700)]
Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: Id0cd5164aa3d404463c520c3361cce521f3577fe
The Android Automerger [Mon, 15 Jul 2013 15:19:20 +0000 (08:19 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
Wink Saville [Fri, 12 Jul 2013 19:14:02 +0000 (12:14 -0700)]
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.
Wink Saville [Fri, 12 Jul 2013 19:03:54 +0000 (12:03 -0700)]
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.
Wink Saville [Fri, 12 Jul 2013 19:01:43 +0000 (12:01 -0700)]
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.
Wink Saville [Fri, 12 Jul 2013 18:58:56 +0000 (18:58 +0000)]
Merge "VZW wants the phoneNumber to be 10 zero's if there isn't one." into jb-mr2-dev
Baligh Uddin [Thu, 11 Jul 2013 21:55:01 +0000 (14:55 -0700)]
am
9d41a551: (-s ours) am
5ecc395e: Merge "Import translations. DO NOT MERGE" into jb-mr2-ub-dev
* commit '
9d41a551e5ceb23afb21db818626a5b377f410a9':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 11 Jul 2013 21:52:27 +0000 (14:52 -0700)]
am
5ecc395e: Merge "Import translations. DO NOT MERGE" into jb-mr2-ub-dev
* commit '
5ecc395ef2c96f899b396e937be97cc597775d8a':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 11 Jul 2013 21:51:49 +0000 (21:51 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Thu, 11 Jul 2013 21:50:16 +0000 (21:50 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-ub-dev
Baligh Uddin [Thu, 11 Jul 2013 21:23:43 +0000 (14:23 -0700)]
am
db4cfb0c: (-s ours) am
9598002a: am
2a1ccab1: Import translations. DO NOT MERGE
* commit '
db4cfb0c85c19451fbf1a07acc629e4caea36120':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 11 Jul 2013 19:25:42 +0000 (12:25 -0700)]
am
9598002a: am
2a1ccab1: Import translations. DO NOT MERGE
* commit '
9598002ab582ca05a5ca1c3b15c8a9d5bbaee2a1':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 11 Jul 2013 19:23:19 +0000 (12:23 -0700)]
am
2a1ccab1: Import translations. DO NOT MERGE
* commit '
2a1ccab1cdd00af6989eadba1a766120d0b10243':
Import translations. DO NOT MERGE
The Android Open Source Project [Thu, 11 Jul 2013 15:08:04 +0000 (08:08 -0700)]
am
eddcf88e: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
* commit '
eddcf88e64f353be6a85f900e9443583adfe3a65':
Wink Saville [Thu, 11 Jul 2013 05:19:26 +0000 (22:19 -0700)]
VZW wants the phoneNumber to be 10 zero's if there isn't one.
Bug:
9784059
Change-Id: I41bba908855648d2560440655d8a75a7cb2e0859
Baligh Uddin [Thu, 11 Jul 2013 03:33:24 +0000 (20:33 -0700)]
Import translations. DO NOT MERGE
Change-Id: I29410b46882d22f35d29bb82bcbffeab31aa11ee
Auto-generated-cl: translation import
Baligh Uddin [Thu, 11 Jul 2013 03:30:12 +0000 (20:30 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8112e19acd0d8d12b5435d467c40e9b93162fca8
Auto-generated-cl: translation import
Baligh Uddin [Thu, 11 Jul 2013 03:28:57 +0000 (20:28 -0700)]
Import translations. DO NOT MERGE
Change-Id: I6b02734b2ef1396af16da6e8102cdbb6ca79a50c
Auto-generated-cl: translation import
Chen Hong [Wed, 10 Jul 2013 09:00:10 +0000 (17:00 +0800)]
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
Satoshi Kataoka [Thu, 11 Jul 2013 03:04:27 +0000 (03:04 +0000)]
Merge "Use InputMethodUtils in input method settings"
Dianne Hackborn [Wed, 10 Jul 2013 18:46:03 +0000 (18:46 +0000)]
Merge "Update to show new location monitoring op."
Satoshi Kataoka [Thu, 4 Jul 2013 11:07:30 +0000 (20:07 +0900)]
Use InputMethodUtils in input method settings
Change-Id: Ifd054c86b7099db3984e559feb5fadf1df5ca227
Brian Carlstrom [Fri, 28 Jun 2013 20:18:41 +0000 (13:18 -0700)]
Add developer option for switching between Dalvik and ART
Change-Id: Ia5a8649e52b607b31429fca258a8fdf62217426c
Dianne Hackborn [Wed, 10 Jul 2013 01:19:11 +0000 (18:19 -0700)]
Update to show new location monitoring op.
Change-Id: I921e95327c743c5b9b89bfe5a94beca67bfdb7de
Amith Yamasani [Wed, 10 Jul 2013 00:06:58 +0000 (17:06 -0700)]
Add the edit text style for tablets to fix layout issue
Bug:
9556589
Change-Id: If9443b2ce10782aeb266e87fbeafa74e158121cd
Amith Yamasani [Tue, 9 Jul 2013 18:33:55 +0000 (18:33 +0000)]
Merge "Fix accidental creation of restriction entry for required apps"
Amith Yamasani [Tue, 9 Jul 2013 18:28:40 +0000 (11:28 -0700)]
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
The Android Open Source Project [Tue, 9 Jul 2013 16:37:51 +0000 (09:37 -0700)]
Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: Ib1fa3361941e032e0ff6137b37ef14eee2e794b2
The Android Automerger [Tue, 9 Jul 2013 12:55:36 +0000 (05:55 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
The Android Open Source Project [Mon, 8 Jul 2013 22:48:50 +0000 (15:48 -0700)]
am
ff2b0d7f: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
* commit '
ff2b0d7f79283665ad3d1fee8a96b3455be7f91d':
The Android Open Source Project [Mon, 8 Jul 2013 22:37:19 +0000 (15:37 -0700)]
Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: I5b0a5ed28f84d9e080f30feeec05975512a8b8f7
Baligh Uddin [Mon, 8 Jul 2013 21:40:59 +0000 (14:40 -0700)]
am
18119223: (-s ours) am
55077df1: am
f1d02056: Import translations. DO NOT MERGE
* commit '
181192235d02e647a161a18ff442367ca8fe7f8f':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 8 Jul 2013 21:40:58 +0000 (14:40 -0700)]
am
369ca5a7: (-s ours) am
20a554fa: Import translations. DO NOT MERGE
* commit '
369ca5a7b07963a77ab2f7c323a552d2c247b401':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 8 Jul 2013 21:38:21 +0000 (14:38 -0700)]
am
55077df1: am
f1d02056: Import translations. DO NOT MERGE
* commit '
55077df18a9bc29171eeb1587ec6c84101e6fa64':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 8 Jul 2013 21:38:18 +0000 (14:38 -0700)]
am
20a554fa: Import translations. DO NOT MERGE
* commit '
20a554fa50620fc51951a12f16a27f83168f4ce3':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 8 Jul 2013 21:35:21 +0000 (14:35 -0700)]
am
f1d02056: Import translations. DO NOT MERGE
* commit '
f1d02056d967b2660424f181ce547b846a92fdec':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 8 Jul 2013 16:22:36 +0000 (09:22 -0700)]
Import translations. DO NOT MERGE
Change-Id: I4f9e9eb6205bd1f638de95696b63e0fb9ec42e83
Auto-generated-cl: translation import
Baligh Uddin [Mon, 8 Jul 2013 16:18:57 +0000 (09:18 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5abf06c94c0aa4a90a11b0a14fe6f04ec6d003c9
Auto-generated-cl: translation import
Baligh Uddin [Mon, 8 Jul 2013 16:17:21 +0000 (09:17 -0700)]
Import translations. DO NOT MERGE
Change-Id: I7d34201de76770bcb6a1998c6d898830ca290006
Auto-generated-cl: translation import
The Android Automerger [Mon, 8 Jul 2013 12:55:42 +0000 (05:55 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
The Android Open Source Project [Wed, 3 Jul 2013 21:36:40 +0000 (14:36 -0700)]
am
d8e00a0b: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
* commit '
d8e00a0ba3993fde61a06623d901bf13705c353d':
The Android Open Source Project [Wed, 3 Jul 2013 21:33:10 +0000 (14:33 -0700)]
Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: I1529161d81082d96363ffb02eab90da17a1ec71e
Baligh Uddin [Wed, 3 Jul 2013 21:30:01 +0000 (14:30 -0700)]
am
143d4600: (-s ours) am
8bd9f2f2: am
76185f72: Import translations. DO NOT MERGE
* commit '
143d4600276b43457ae12eaaa9c585ca2650a908':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 3 Jul 2013 21:30:00 +0000 (14:30 -0700)]
am
7f49b198: (-s ours) am
df0ad0dc: am
aa03b2f6: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
* commit '
7f49b198d0f7477cf6a64e704260373b65ba71f4':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 3 Jul 2013 21:27:40 +0000 (14:27 -0700)]
am
8bd9f2f2: am
76185f72: Import translations. DO NOT MERGE
* commit '
8bd9f2f287dec8ff9abb4de1830a1a91fc7212c2':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 3 Jul 2013 21:27:39 +0000 (14:27 -0700)]
am
df0ad0dc: am
aa03b2f6: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
* commit '
df0ad0dc86b41b009943f97956b7a36b00c9eef8':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 3 Jul 2013 21:24:47 +0000 (14:24 -0700)]
am
76185f72: Import translations. DO NOT MERGE
* commit '
76185f7201b3e8a2d341a62c13f8ac259203a7e7':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 3 Jul 2013 21:24:47 +0000 (14:24 -0700)]
am
aa03b2f6: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
* commit '
aa03b2f6a61bc2ea4e7ad9b07a2841363a3a7a73':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 3 Jul 2013 21:22:20 +0000 (14:22 -0700)]
am
8db7a8c5: (-s ours) am
ad965c17: Import translations. DO NOT MERGE
* commit '
8db7a8c58e6732f0a7341657ff162ff49d031ebd':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 3 Jul 2013 21:21:03 +0000 (14:21 -0700)]
am
ad965c17: Import translations. DO NOT MERGE
* commit '
ad965c173bd5a6f98d14a6e1ef83087cc55bd5ef':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 3 Jul 2013 20:59:41 +0000 (13:59 -0700)]
Import translations. DO NOT MERGE
Change-Id: If98562e409c4046b37b8b1a92b171e222403233f
Auto-generated-cl: translation import
Baligh Uddin [Wed, 3 Jul 2013 20:56:12 +0000 (13:56 -0700)]
Import translations. DO NOT MERGE
Change-Id: I45c8315e3a471262b48485768ba402b35b559886
Auto-generated-cl: translation import
Baligh Uddin [Wed, 3 Jul 2013 20:54:27 +0000 (13:54 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia71c4566436300b1c190865f9dc0d490d62d8ebb
Auto-generated-cl: translation import
Baligh Uddin [Tue, 2 Jul 2013 19:41:23 +0000 (12:41 -0700)]
am
daa0e5ab: (-s ours) am
e462f0d5: Merge "Import translations. DO NOT MERGE" into jb-mr2-ub-dev
* commit '
daa0e5ab7acca1d96278c416ce0060524507af01':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 2 Jul 2013 19:33:11 +0000 (12:33 -0700)]
am
e462f0d5: Merge "Import translations. DO NOT MERGE" into jb-mr2-ub-dev
* commit '
e462f0d5b9b131523240795c23dc6ec39fb19306':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 2 Jul 2013 16:35:06 +0000 (16:35 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Tue, 2 Jul 2013 16:34:32 +0000 (16:34 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-ub-dev
Baligh Uddin [Tue, 2 Jul 2013 16:34:18 +0000 (16:34 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
The Android Automerger [Tue, 2 Jul 2013 12:55:33 +0000 (05:55 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
Wink Saville [Tue, 2 Jul 2013 00:01:28 +0000 (17:01 -0700)]
am
17f1fa42: am
7319f2b1: am
5d5a269f: Add Manage mobile plan to Settings.
* commit '
17f1fa4207e45276a11e52bbc65dc26a25911006':
Add Manage mobile plan to Settings.
Wink Saville [Mon, 1 Jul 2013 23:33:01 +0000 (16:33 -0700)]
am
7319f2b1: am
5d5a269f: Add Manage mobile plan to Settings.
* commit '
7319f2b123772d72417cd09e8f3f04441c93d13d':
Add Manage mobile plan to Settings.
Wink Saville [Mon, 1 Jul 2013 23:31:35 +0000 (16:31 -0700)]
am
5d5a269f: Add Manage mobile plan to Settings.
* commit '
5d5a269f59aa5caa986eff3cb988d7585b2cd43c':
Add Manage mobile plan to Settings.
Wink Saville [Sat, 29 Jun 2013 14:54:13 +0000 (07:54 -0700)]
Add Manage mobile plan to Settings.
Bug:
9279964
Change-Id: I42c326a21e05aa301e9d974ed9ac1d59472780ec
Baligh Uddin [Mon, 1 Jul 2013 16:24:12 +0000 (09:24 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9fab5b88800615e150968d8b664b1553b808f399
Auto-generated-cl: translation import
Baligh Uddin [Mon, 1 Jul 2013 16:20:37 +0000 (09:20 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2fb9c2692fa420eee7416690dc768a966ff1a9b9
Auto-generated-cl: translation import
Baligh Uddin [Mon, 1 Jul 2013 16:19:04 +0000 (09:19 -0700)]
Import translations. DO NOT MERGE
Change-Id: I69c1ffe7da49a43516d5233f6f4c7cec6227eb04
Auto-generated-cl: translation import
The Android Open Source Project [Mon, 1 Jul 2013 14:47:44 +0000 (07:47 -0700)]
am
6ab277ee: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
* commit '
6ab277ee50d91bb6b50cacda55e84ac3afc4323b':
The Android Open Source Project [Mon, 1 Jul 2013 14:43:20 +0000 (07:43 -0700)]
Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: I6534b46c13c3ae03f703e70a546f54a59fc4adc0
The Android Automerger [Sun, 30 Jun 2013 12:55:34 +0000 (05:55 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
Amith Yamasani [Fri, 28 Jun 2013 22:35:54 +0000 (22:35 +0000)]
Merge "Don't start the loader task if one is already running"
Amith Yamasani [Fri, 28 Jun 2013 22:30:08 +0000 (15:30 -0700)]
Don't start the loader task if one is already running
This should appease the monkeys.
Bug:
9619255
Change-Id: Idbac0bd86acafbdb636b0b18e09fcbb9eea15cc4
Robert Greenwalt [Fri, 28 Jun 2013 17:48:40 +0000 (10:48 -0700)]
am
50702355: am
5d3ef571: am
a1454529: Merge "Dont enable Wi-Fi if it\'s not toggleable in flight mode"
* commit '
50702355f23d5e270727018c2af7cc76a1bd91eb':
Dont enable Wi-Fi if it's not toggleable in flight mode
OSDN Git Service
