OSDN Git Service
Dianne Hackborn [Mon, 5 Aug 2013 18:15:43 +0000 (11:15 -0700)]
am
8f00b771: Merge "Fix app ops details not displaying permissions under certain conditions."
* commit '
8f00b7711c48a102a70f9b7e6a563aa14b79f5a5':
Fix app ops details not displaying permissions under certain conditions.
Dianne Hackborn [Mon, 5 Aug 2013 18:11:11 +0000 (18:11 +0000)]
Merge "Fix app ops details not displaying permissions under certain conditions."
Danny Baumann [Mon, 5 Aug 2013 12:28:58 +0000 (14:28 +0200)]
Fix app ops details not displaying permissions under certain conditions.
If there's a permission that is not granted, the loop is aborted instead
of just skipping said permission.
Change-Id: Icca567ebdd818f40ad6619f258c77590074d1deb
Dianne Hackborn [Sat, 3 Aug 2013 02:32:14 +0000 (19:32 -0700)]
am
0a09b13c: am
a6683e0f: Reset app preferences now resets all app ops.
* commit '
0a09b13c81bb0ebe556e46e3859a25805b2cbdcf':
Reset app preferences now resets all app ops.
Dianne Hackborn [Sat, 3 Aug 2013 02:30:09 +0000 (19:30 -0700)]
am
a6683e0f: Reset app preferences now resets all app ops.
* commit '
a6683e0f4af75005ab5a1742d30df4bee071f725':
Reset app preferences now resets all app ops.
Dianne Hackborn [Sat, 3 Aug 2013 01:22:42 +0000 (18:22 -0700)]
Reset app preferences now resets all app ops.
Change-Id: I7966245b5f322f55e139b2da661c02cd58530f11
Jean-Baptiste Queru [Sat, 3 Aug 2013 00:44:48 +0000 (17:44 -0700)]
am
4dce3456: am
034b83e8: Reconcile with AOSP jb-mr2-dev - do not merge
* commit '
4dce3456c7c858d5cec053cfd8a7f8ff2babec1d':
Completely remove app ops activity.
Jean-Baptiste Queru [Sat, 3 Aug 2013 00:39:03 +0000 (17:39 -0700)]
am
034b83e8: Reconcile with AOSP jb-mr2-dev - do not merge
* commit '
034b83e8668a0b26d1eccfc9fa433b8eae3e50a8':
Completely remove app ops activity.
Jean-Baptiste Queru [Fri, 2 Aug 2013 21:48:27 +0000 (14:48 -0700)]
Reconcile with AOSP jb-mr2-dev - do not merge
Dianne Hackborn [Mon, 1 Jul 2013 19:54:54 +0000 (12:54 -0700)]
Completely remove app ops activity.
Change-Id: Ibe2f15c9ff7589fd5527a0f249d7c1eeca868c8a
Dianne Hackborn [Fri, 2 Aug 2013 21:41:18 +0000 (14:41 -0700)]
am
ca1b7458: Completely remove app ops activity.
* commit '
ca1b7458244191214172009d21eae2d04b6992f9':
Completely remove app ops activity.
Dianne Hackborn [Mon, 1 Jul 2013 19:54:54 +0000 (12:54 -0700)]
Completely remove app ops activity.
Change-Id: Ibe2f15c9ff7589fd5527a0f249d7c1eeca868c8a
Dave Burke [Fri, 2 Aug 2013 20:42:04 +0000 (13:42 -0700)]
am
1a32d477: am
136059f1: Merge "Revert "Completely remove app ops activity."" into jb-mr2-dev
* commit '
1a32d477934399ca5331863fe17651c1dbf165b8':
Revert "Completely remove app ops activity."
Dave Burke [Fri, 2 Aug 2013 20:39:13 +0000 (13:39 -0700)]
am
136059f1: Merge "Revert "Completely remove app ops activity."" into jb-mr2-dev
* commit '
136059f118b580a3dc8f3023d1d19c8c56020a01':
Revert "Completely remove app ops activity."
Dave Burke [Fri, 2 Aug 2013 20:36:33 +0000 (20:36 +0000)]
Merge "Revert "Completely remove app ops activity."" into jb-mr2-dev
Dave Burke [Fri, 2 Aug 2013 20:25:35 +0000 (20:25 +0000)]
Revert "Completely remove app ops activity."
This reverts commit
1ad26e9c370e3db3ac801bda42b3fa52ab2e2d07.
Change-Id: I58b5ea280ed0dbff00f7f6f98fbd41575cdd5222
Sascha Prueter [Thu, 1 Aug 2013 21:01:13 +0000 (14:01 -0700)]
am
df195650: am
d346fce2: Merge "Completely remove app ops activity." into jb-mr2-dev
* commit '
df195650191ba2d5a6090ff0721242b044b9b010':
Completely remove app ops activity.
Sascha Prueter [Thu, 1 Aug 2013 20:58:23 +0000 (13:58 -0700)]
am
d346fce2: Merge "Completely remove app ops activity." into jb-mr2-dev
* commit '
d346fce2687237d30677b69e66c76ba6cba8622b':
Completely remove app ops activity.
Sascha Prueter [Thu, 1 Aug 2013 20:55:38 +0000 (20:55 +0000)]
Merge "Completely remove app ops activity." into jb-mr2-dev
Baligh Uddin [Tue, 30 Jul 2013 16:19:30 +0000 (09:19 -0700)]
am
bdf28a18: (-s ours) am
0cb57011: (-s ours) Import translations. DO NOT MERGE
* commit '
bdf28a1892e0116a8d6774d9c9d47033eb354368':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 30 Jul 2013 16:15:32 +0000 (09:15 -0700)]
am
0cb57011: (-s ours) Import translations. DO NOT MERGE
* commit '
0cb57011065dd06e5faba2f4d72bbb1d31a3c309':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 30 Jul 2013 16:12:51 +0000 (09:12 -0700)]
am
3ddbe519: (-s ours) Import translations. DO NOT MERGE
* commit '
3ddbe519f44292e33292a9aea08a5894456a3118':
Import translations. DO NOT MERGE
Robert Greenwalt [Mon, 29 Jul 2013 23:50:30 +0000 (16:50 -0700)]
am
35a2d796: Merge "Fix "Add Network" show last selected WiFi AP Dialog"
* commit '
35a2d796e3afbd7c2572c16f5c8655d89078198b':
Fix "Add Network" show last selected WiFi AP Dialog
Robert Greenwalt [Mon, 29 Jul 2013 23:43:33 +0000 (23:43 +0000)]
Merge "Fix "Add Network" show last selected WiFi AP Dialog"
Baligh Uddin [Mon, 29 Jul 2013 17:54:51 +0000 (10:54 -0700)]
Import translations. DO NOT MERGE
Change-Id: I0ca4e8fc4396ac28c5c6d7857a988a6191e36f2c
Auto-generated-cl: translation import
Baligh Uddin [Mon, 29 Jul 2013 17:53:05 +0000 (10:53 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5ab9317a61cf7adb7c911ac19770e9ae7d4f935b
Auto-generated-cl: translation import
Birdson_Chen [Fri, 26 Jul 2013 08:48:28 +0000 (16:48 +0800)]
Fix "Add Network" show last selected WiFi AP Dialog
When user taps Wi-Fi add network button, the pop-up dialog is not empty (it shows last selected WiFi AP Dialog).
The above is observed after the following steps:
- Launch Settings application
- Turn on Wi-Fi
- Select any Wi-Fi Access Point which is not connected previously and change to portrait mode
- Press Cancel from the pop-up and select Add Network icon in menu
Because the "Rotation" operation will cause WifiDialog re-creating and the current settings
of selected Wi-Fi Access Point is saved before WifiDialog destroyed.
Then, the saved Wi-Fi Access Point is displayed when user tap on "Add Network".
It need to clear the saved Wi-Fi Access Point when WifiDialog re-creating.
Change-Id: I3e93943e5bee405329e309c3ec88a35ee9cafc43
Baligh Uddin [Thu, 25 Jul 2013 02:57:34 +0000 (19:57 -0700)]
am
92ce2809: am
542960fb: Import translations. DO NOT MERGE
* commit '
92ce280985b206acfbfef896db745bc4464a4632':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 25 Jul 2013 02:54:17 +0000 (19:54 -0700)]
am
693abd31: Import translations. DO NOT MERGE
* commit '
693abd31368cd61266c6d055fbd6ead257eb12cd':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 25 Jul 2013 02:53:29 +0000 (19:53 -0700)]
am
542960fb: Import translations. DO NOT MERGE
* commit '
542960fbbb0c122d7f3a75fd2d5c4710118417ee':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 24 Jul 2013 19:15:51 +0000 (12:15 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8dd4886617b33c56d57ef050c560a91748b68113
Auto-generated-cl: translation import
Baligh Uddin [Wed, 24 Jul 2013 19:14:17 +0000 (12:14 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iddc12747b1f57abb0a10f452b551332e86d2ba3c
Auto-generated-cl: translation import
Baligh Uddin [Tue, 23 Jul 2013 17:02:05 +0000 (10:02 -0700)]
am
0d8bde94: am
6b939fe2: Import translations. DO NOT MERGE
* commit '
0d8bde94110681d3cc7288613c7e1204f436736c':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 23 Jul 2013 17:02:05 +0000 (10:02 -0700)]
am
dd00b6b0: Import translations. DO NOT MERGE
* commit '
dd00b6b013dbacadb9db552b74551c452c8981c7':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 23 Jul 2013 17:00:14 +0000 (10:00 -0700)]
am
6b939fe2: Import translations. DO NOT MERGE
* commit '
6b939fe2c8994acc3e304ec24639d07877a4b255':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 22 Jul 2013 18:10:07 +0000 (11:10 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8c68608b9494ea120e4620cfa3c0027298c0082a
Auto-generated-cl: translation import
Baligh Uddin [Mon, 22 Jul 2013 18:08:10 +0000 (11:08 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2f0dc917cd2d67b4478f74d0e2dccec53eb9f921
Auto-generated-cl: translation import
Baligh Uddin [Fri, 19 Jul 2013 22:18:54 +0000 (15:18 -0700)]
am
a4a2194a: am
68b87505: Import translations. DO NOT MERGE
* commit '
a4a2194a2f4beb9f29a96249e4b3b2a4f9e80c96':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 19 Jul 2013 22:16:17 +0000 (15:16 -0700)]
am
68b87505: Import translations. DO NOT MERGE
* commit '
68b87505548be6e6734d4cfe90c450b243950455':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 19 Jul 2013 22:15:36 +0000 (15:15 -0700)]
am
8180a3a8: Merge "Import translations. DO NOT MERGE" into jb-mr2-ub-dev
* commit '
8180a3a86a36a7b9ed463f2f162e82ac06a9f1c4':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 19 Jul 2013 22:14:12 +0000 (22:14 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-ub-dev
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
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:31:45 +0000 (14:31 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ife5526347f8eab9b8b385b5b6f265c1678b8e94a
Auto-generated-cl: translation import
Baligh Uddin [Thu, 18 Jul 2013 21:30:01 +0000 (14:30 -0700)]
Import translations. DO NOT MERGE
Change-Id: I09a9a2433e7be85d771059ecd1c4a514a3f61371
Auto-generated-cl: translation import
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: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: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 [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: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: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: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:50:16 +0000 (21:50 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-ub-dev
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
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: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
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: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: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: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: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: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: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: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: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: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 [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
Dianne Hackborn [Mon, 1 Jul 2013 19:54:54 +0000 (12:54 -0700)]
Completely remove app ops activity.
Change-Id: Ibe2f15c9ff7589fd5527a0f249d7c1eeca868c8a
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: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
Robert Greenwalt [Fri, 28 Jun 2013 15:08:17 +0000 (08:08 -0700)]
am
5d3ef571: am
a1454529: Merge "Dont enable Wi-Fi if it\'s not toggleable in flight mode"
* commit '
5d3ef5715c43ca9c3c969deaf25c76a7d3e27624':
Dont enable Wi-Fi if it's not toggleable in flight mode
Robert Greenwalt [Fri, 28 Jun 2013 15:06:25 +0000 (08:06 -0700)]
am
a1454529: Merge "Dont enable Wi-Fi if it\'s not toggleable in flight mode"
* commit '
a1454529c3eb6d0e87b254888abfea3bb714f7fe':
Dont enable Wi-Fi if it's not toggleable in flight mode
OSDN Git Service
