OSDN Git Service
Lifu Tang [Tue, 3 Sep 2013 18:00:39 +0000 (11:00 -0700)]
am
703689be: am
7e2227fc: Merge "Ignores AppOps entries belonging to other users" into klp-dev
* commit '
703689beed8b39b30f0fd57f9735f3f800bd86b3':
Ignores AppOps entries belonging to other users
Lifu Tang [Tue, 3 Sep 2013 17:57:30 +0000 (10:57 -0700)]
am
7e2227fc: Merge "Ignores AppOps entries belonging to other users" into klp-dev
* commit '
7e2227fc657cf22f39a5db4741e6ab46b20c0dc2':
Ignores AppOps entries belonging to other users
Lifu Tang [Tue, 3 Sep 2013 17:55:48 +0000 (17:55 +0000)]
Merge "Ignores AppOps entries belonging to other users" into klp-dev
Martijn Coenen [Tue, 3 Sep 2013 17:34:45 +0000 (10:34 -0700)]
am
2b8511c1: am
ec8f11da: Merge "NFC Tap&Pay: deal with changes from API review." into klp-dev
* commit '
2b8511c1531c1b213f2a23d23772eb8df550cc5a':
NFC Tap&Pay: deal with changes from API review.
Martijn Coenen [Tue, 3 Sep 2013 17:28:28 +0000 (10:28 -0700)]
am
ec8f11da: Merge "NFC Tap&Pay: deal with changes from API review." into klp-dev
* commit '
ec8f11da8fb7b5f698e2861311e1291f6f5770f9':
NFC Tap&Pay: deal with changes from API review.
Martijn Coenen [Tue, 3 Sep 2013 17:25:15 +0000 (17:25 +0000)]
Merge "NFC Tap&Pay: deal with changes from API review." into klp-dev
Lifu Tang [Tue, 3 Sep 2013 17:12:20 +0000 (10:12 -0700)]
am
026702df: am
06659c5a: Merge "Creates Sipper even the consumption is very little" into klp-dev
* commit '
026702dff008408c90678584332b1a798ed5fb90':
Creates Sipper even the consumption is very little
Lifu Tang [Tue, 3 Sep 2013 17:12:19 +0000 (10:12 -0700)]
am
79063a45: am
47aab2ee: Merge "Shows correct state when location sharing disabled" into klp-dev
* commit '
79063a456932f91d521a80f9c643ca1397654698':
Shows correct state when location sharing disabled
Lifu Tang [Tue, 3 Sep 2013 17:09:16 +0000 (10:09 -0700)]
am
06659c5a: Merge "Creates Sipper even the consumption is very little" into klp-dev
* commit '
06659c5a55c8ad5b7b640d23ed03fa2a8cbbab49':
Creates Sipper even the consumption is very little
Lifu Tang [Tue, 3 Sep 2013 17:09:15 +0000 (10:09 -0700)]
am
47aab2ee: Merge "Shows correct state when location sharing disabled" into klp-dev
* commit '
47aab2eed7263e9593f1e866672f73ec30c7bc17':
Shows correct state when location sharing disabled
Lifu Tang [Fri, 30 Aug 2013 23:02:16 +0000 (16:02 -0700)]
Ignores AppOps entries belonging to other users
- Fix b/
10567352
Change-Id: I6aac030a426e5a881578b518a9cf6bad8679d087
Lifu Tang [Tue, 3 Sep 2013 17:01:56 +0000 (17:01 +0000)]
Merge "Creates Sipper even the consumption is very little" into klp-dev
Lifu Tang [Tue, 3 Sep 2013 17:01:33 +0000 (17:01 +0000)]
Merge "Shows correct state when location sharing disabled" into klp-dev
Amith Yamasani [Tue, 3 Sep 2013 16:02:41 +0000 (09:02 -0700)]
am
c6380a26: am
a2aaf0e6: Merge "Add a missing fragment to list of valid ones for top-level settings" into klp-dev
* commit '
c6380a2622978fefb9b007e3ad09744ab1aff20b':
Add a missing fragment to list of valid ones for top-level settings
Amith Yamasani [Tue, 3 Sep 2013 16:00:33 +0000 (09:00 -0700)]
am
a2aaf0e6: Merge "Add a missing fragment to list of valid ones for top-level settings" into klp-dev
* commit '
a2aaf0e60fcbfc5b6eaac06e9663e2af0bc82c7c':
Add a missing fragment to list of valid ones for top-level settings
Amith Yamasani [Tue, 3 Sep 2013 15:57:24 +0000 (15:57 +0000)]
Merge "Add a missing fragment to list of valid ones for top-level settings" into klp-dev
Lifu Tang [Sat, 31 Aug 2013 01:03:43 +0000 (18:03 -0700)]
Creates Sipper even the consumption is very little
Change-Id: I9682f262a481f3586760b8464b96eeb22814a840
Wink Saville [Sat, 31 Aug 2013 00:31:17 +0000 (17:31 -0700)]
am
c2fbc774: am
a2904f9d: am
d5c71fc4: am
e38165ca: am
7bee4c29: Use correct action string for provisioning.
* commit '
c2fbc77451546a51c82d2b50825a7a0e51e4e0a1':
Use correct action string for provisioning.
Wink Saville [Sat, 31 Aug 2013 00:29:15 +0000 (17:29 -0700)]
am
a2904f9d: am
d5c71fc4: am
e38165ca: am
7bee4c29: Use correct action string for provisioning.
* commit '
a2904f9d5091ef5055d97adf72d32e8c19551c8e':
Use correct action string for provisioning.
Wink Saville [Sat, 31 Aug 2013 00:26:19 +0000 (17:26 -0700)]
am
d5c71fc4: am
e38165ca: am
7bee4c29: Use correct action string for provisioning.
* commit '
d5c71fc4e613d80d1ff8c128f29d9c201bcb3f90':
Use correct action string for provisioning.
Lifu Tang [Fri, 30 Aug 2013 01:06:30 +0000 (18:06 -0700)]
Shows correct state when location sharing disabled
- Fix b/
10553306
Change-Id: I01f69aaeb79e18ddf29da5aef7ea00938e674429
Amith Yamasani [Fri, 30 Aug 2013 22:43:44 +0000 (15:43 -0700)]
Add a missing fragment to list of valid ones for top-level settings
Bug:
10552817
Change-Id: I1ea80de565d1ec58da834cdd67dab0cb71e635b7
Alan Viverette [Fri, 30 Aug 2013 21:42:50 +0000 (14:42 -0700)]
am
c7e34676: am
6dde146d: Merge "Update captioning settings to match revised API" into klp-dev
* commit '
c7e34676ffffa03269f5686072abd5eae60fa85f':
Update captioning settings to match revised API
Alan Viverette [Fri, 30 Aug 2013 21:38:21 +0000 (14:38 -0700)]
am
6dde146d: Merge "Update captioning settings to match revised API" into klp-dev
* commit '
6dde146df030dfada1a9e112621e97424a2b6e3c':
Update captioning settings to match revised API
Alan Viverette [Fri, 30 Aug 2013 21:35:04 +0000 (21:35 +0000)]
Merge "Update captioning settings to match revised API" into klp-dev
Martijn Coenen [Fri, 30 Aug 2013 19:57:42 +0000 (12:57 -0700)]
NFC Tap&Pay: deal with changes from API review.
Also, removed "Ask every time" mode.
Bug:
10550349
Change-Id: If7c300f9f446e3c31d594116ac8e20fb50d9ec3f
Maggie Benthall [Fri, 30 Aug 2013 13:59:02 +0000 (06:59 -0700)]
am
02f71126: am
ac19f2bc: Merge "Fixes for pin-restricted settings." into klp-dev
* commit '
02f711263cf30daf90361a4ba93bef4c2d0e38fc':
Fixes for pin-restricted settings.
Maggie Benthall [Fri, 30 Aug 2013 13:56:29 +0000 (06:56 -0700)]
am
ac19f2bc: Merge "Fixes for pin-restricted settings." into klp-dev
* commit '
ac19f2bc1c65865fa59feb7fbd9e19dd259048c3':
Fixes for pin-restricted settings.
Maggie Benthall [Fri, 30 Aug 2013 13:54:28 +0000 (13:54 +0000)]
Merge "Fixes for pin-restricted settings." into klp-dev
Wink Saville [Fri, 30 Aug 2013 03:42:59 +0000 (20:42 -0700)]
am
e38165ca: am
7bee4c29: Use correct action string for provisioning.
* commit '
e38165caf08a164999b9518dd1f16c9f94d581e9':
Use correct action string for provisioning.
Wink Saville [Fri, 30 Aug 2013 03:41:04 +0000 (20:41 -0700)]
am
7bee4c29: Use correct action string for provisioning.
* commit '
7bee4c294204be49edf58e9251726425ffcc5748':
Use correct action string for provisioning.
Wink Saville [Fri, 30 Aug 2013 02:58:09 +0000 (19:58 -0700)]
Use correct action string for provisioning.
Change to use the correct action string
com.adnroid.server.connectivityservice.CONNECTED_TO_PROVISIONING_NETWORK
Bug:
10551510
Change-Id: I917de4fcde06b72f520dec38e42c50859b2ee098
Lifu Tang [Thu, 29 Aug 2013 23:50:43 +0000 (16:50 -0700)]
am
01ec62c4: am
5aacc542: Merge "Replaced ContentQueryMap with CursorLoader" into klp-dev
* commit '
01ec62c46bc8bb54282cc11ee2c34d01d6986cc5':
Replaced ContentQueryMap with CursorLoader
Lifu Tang [Thu, 29 Aug 2013 23:46:37 +0000 (16:46 -0700)]
am
5aacc542: Merge "Replaced ContentQueryMap with CursorLoader" into klp-dev
* commit '
5aacc54289ab813fdefc2d6b3e8473a241706232':
Replaced ContentQueryMap with CursorLoader
Lifu Tang [Thu, 29 Aug 2013 23:43:59 +0000 (23:43 +0000)]
Merge "Replaced ContentQueryMap with CursorLoader" into klp-dev
Wink Saville [Thu, 29 Aug 2013 22:20:15 +0000 (15:20 -0700)]
am
67312293: am
ec3c7762: am
1bc2db22: am
0e042a44: am
289c2f0d: Merge "Use MOBILE_PROVISIONING_ACTION for manage mobile plan." into jb-mr2-dev
* commit '
67312293aea0083d2905f74756d02a37ec999b6c':
Use MOBILE_PROVISIONING_ACTION for manage mobile plan.
Wink Saville [Thu, 29 Aug 2013 22:17:48 +0000 (15:17 -0700)]
am
ec3c7762: am
1bc2db22: am
0e042a44: am
289c2f0d: Merge "Use MOBILE_PROVISIONING_ACTION for manage mobile plan." into jb-mr2-dev
* commit '
ec3c7762129429e0666f77f812849181f3be461a':
Use MOBILE_PROVISIONING_ACTION for manage mobile plan.
Wink Saville [Thu, 29 Aug 2013 22:16:30 +0000 (15:16 -0700)]
am
c4112d6c: am
79e2c32c: Merge "Use MOBILE_PROVISIONING_ACTION for manage mobile plan." into klp-dev
* commit '
c4112d6c88452e5bcfc28df632640b12062cdf14':
Use MOBILE_PROVISIONING_ACTION for manage mobile plan.
Wink Saville [Thu, 29 Aug 2013 22:15:53 +0000 (15:15 -0700)]
am
1bc2db22: am
0e042a44: am
289c2f0d: Merge "Use MOBILE_PROVISIONING_ACTION for manage mobile plan." into jb-mr2-dev
* commit '
1bc2db2221f6cdb92cce5d40f9eb940fe0ed4914':
Use MOBILE_PROVISIONING_ACTION for manage mobile plan.
Wink Saville [Thu, 29 Aug 2013 22:14:05 +0000 (15:14 -0700)]
am
79e2c32c: Merge "Use MOBILE_PROVISIONING_ACTION for manage mobile plan." into klp-dev
* commit '
79e2c32cfb96f617a4a8514f70d55d49ef509f43':
Use MOBILE_PROVISIONING_ACTION for manage mobile plan.
Wink Saville [Thu, 29 Aug 2013 22:11:11 +0000 (22:11 +0000)]
Merge "Use MOBILE_PROVISIONING_ACTION for manage mobile plan." into klp-dev
Maggie Benthall [Thu, 29 Aug 2013 14:49:13 +0000 (10:49 -0400)]
Fixes for pin-restricted settings.
- Reprompt for pin after screen has been locked and unlocked.
- For protected preferences, store the Preference and continue if pin entry is successful.
- Protect whole UserSettings and DevelopmentSettings pages.
Bug:
10543207
Change-Id: If1d4b31ca94a8cfc103625b74385bcd0bdd3d88b
Lifu Tang [Thu, 29 Aug 2013 21:42:12 +0000 (14:42 -0700)]
Replaced ContentQueryMap with CursorLoader
- Piggyback a trivial typo fix from previous change
- Fix b/
10228666
Change-Id: I96c4f5c434b67caf10b3406eec4f3f7c5cf846e9
Tom O'Neill [Thu, 29 Aug 2013 21:28:34 +0000 (14:28 -0700)]
am
3e33cc62: am
4f08ddb2: Merge "Make sure we\'ve finished loading settings before processing any reloads" into klp-dev
* commit '
3e33cc628f5f21758c9b9fa5f35d81ca6bd232ec':
Make sure we've finished loading settings before processing any reloads
Tom O'Neill [Thu, 29 Aug 2013 21:26:27 +0000 (14:26 -0700)]
am
4f08ddb2: Merge "Make sure we\'ve finished loading settings before processing any reloads" into klp-dev
* commit '
4f08ddb28c4569004f888ea2955667b27485adf8':
Make sure we've finished loading settings before processing any reloads
Tom O'Neill [Thu, 29 Aug 2013 21:22:54 +0000 (21:22 +0000)]
Merge "Make sure we've finished loading settings before processing any reloads" into klp-dev
Wink Saville [Wed, 28 Aug 2013 21:26:27 +0000 (14:26 -0700)]
Use MOBILE_PROVISIONING_ACTION for manage mobile plan.
Bug:
10328264
Change-Id: I3925004011bb1243793c4c1b963d923dc2b00cb5
Martijn Coenen [Thu, 29 Aug 2013 21:09:37 +0000 (14:09 -0700)]
am
d38d6cb8: am
ad320aa8: Merge "Update NFC payments to match new framework APIs." into klp-dev
* commit '
d38d6cb829c64343038c023e69d33c8cbc925a4d':
Update NFC payments to match new framework APIs.
Martijn Coenen [Thu, 29 Aug 2013 21:06:24 +0000 (14:06 -0700)]
am
ad320aa8: Merge "Update NFC payments to match new framework APIs." into klp-dev
* commit '
ad320aa8d350e859a87269c67d6afd2f5401cf61':
Update NFC payments to match new framework APIs.
Martijn Coenen [Thu, 29 Aug 2013 21:01:16 +0000 (21:01 +0000)]
Merge "Update NFC payments to match new framework APIs." into klp-dev
Wink Saville [Thu, 29 Aug 2013 18:57:48 +0000 (11:57 -0700)]
am
0e042a44: am
289c2f0d: Merge "Use MOBILE_PROVISIONING_ACTION for manage mobile plan." into jb-mr2-dev
* commit '
0e042a44a8ee0e26d92be8d73d7ed297b4beab37':
Use MOBILE_PROVISIONING_ACTION for manage mobile plan.
Lifu Tang [Thu, 29 Aug 2013 18:35:22 +0000 (11:35 -0700)]
am
5301d57c: am
1f2779f2: Merge "Fixed the widget location toggle button" into klp-dev
* commit '
5301d57cbe9c5e7c11f842188fb8a13127918e68':
Fixed the widget location toggle button
Lifu Tang [Thu, 29 Aug 2013 18:33:18 +0000 (11:33 -0700)]
am
1f2779f2: Merge "Fixed the widget location toggle button" into klp-dev
* commit '
1f2779f2c46ab14e4f912a5f330b26c0a59ec137':
Fixed the widget location toggle button
Lifu Tang [Thu, 29 Aug 2013 18:31:27 +0000 (18:31 +0000)]
Merge "Fixed the widget location toggle button" into klp-dev
Tom O'Neill [Thu, 29 Aug 2013 17:48:13 +0000 (10:48 -0700)]
Make sure we've finished loading settings before processing any reloads
- Effectively throttles case where many reloads are sent in rapid
succession.
- Simplify Handler state machine by making the state explicit instead
of implicit in the sequence of messages.
- To guard against cascading timeouts due to RAM pressure or other
systemic issues, only start additional services if there is at most one
timed out setting at a time.
- Add some log messages
- Fix b/
10487253
Change-Id: Ibe21533f7b644bbadf5b56b61ca0e28b49192470
Wink Saville [Thu, 29 Aug 2013 17:23:04 +0000 (10:23 -0700)]
am
289c2f0d: Merge "Use MOBILE_PROVISIONING_ACTION for manage mobile plan." into jb-mr2-dev
* commit '
289c2f0d3013f423849a9485b3044f0a1fc8dd92':
Use MOBILE_PROVISIONING_ACTION for manage mobile plan.
Wink Saville [Thu, 29 Aug 2013 17:20:24 +0000 (17:20 +0000)]
Merge "Use MOBILE_PROVISIONING_ACTION for manage mobile plan." into jb-mr2-dev
Baligh Uddin [Thu, 29 Aug 2013 15:07:45 +0000 (08:07 -0700)]
am
57b8416b: (-s ours) am
da1f8abd: (-s ours) am
f7b5ad80: (-s ours) am
da7395d6: (-s ours) am
c7902845: (-s ours) Import translations. DO NOT MERGE
* commit '
57b8416b4b31ef5a76553dc3e51510c46bfb8320':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 29 Aug 2013 15:04:27 +0000 (08:04 -0700)]
am
da1f8abd: (-s ours) am
f7b5ad80: (-s ours) am
da7395d6: (-s ours) am
c7902845: (-s ours) Import translations. DO NOT MERGE
* commit '
da1f8abda6fa4b1cd1018c7415ebcfbea8fa1f6f':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 29 Aug 2013 15:04:06 +0000 (08:04 -0700)]
am
28939160: (-s ours) am
0aad9801: (-s ours) am
439b1543: (-s ours) am
17d0af91: (-s ours) Import translations. DO NOT MERGE
* commit '
28939160e41999fa1b0b0ef3a7dc0ac3f0157d1e':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 29 Aug 2013 15:00:59 +0000 (08:00 -0700)]
am
0aad9801: (-s ours) am
439b1543: (-s ours) am
17d0af91: (-s ours) Import translations. DO NOT MERGE
* commit '
0aad9801705675c246fe548f687ed14359b53f78':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 29 Aug 2013 14:59:30 +0000 (07:59 -0700)]
am
f7b5ad80: (-s ours) am
da7395d6: (-s ours) am
c7902845: (-s ours) Import translations. DO NOT MERGE
* commit '
f7b5ad80a8e31d717ffed1a0b7a1403c3bf75cd1':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 29 Aug 2013 14:57:04 +0000 (07:57 -0700)]
am
da7395d6: (-s ours) am
c7902845: (-s ours) Import translations. DO NOT MERGE
* commit '
da7395d6c5a92738c2e7130590f30a536ec94b54':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 29 Aug 2013 14:56:26 +0000 (07:56 -0700)]
am
192296f0: (-s ours) am
02f3f202: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
192296f0b9ee46831ecb36dbe8255fa3e58c3add':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 29 Aug 2013 14:56:04 +0000 (07:56 -0700)]
am
439b1543: (-s ours) am
17d0af91: (-s ours) Import translations. DO NOT MERGE
* commit '
439b1543119fd97d134c602d92fc6ce9a517be20':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 29 Aug 2013 14:54:22 +0000 (07:54 -0700)]
am
02f3f202: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
02f3f2028fbd50ad39936e5b295d89039469fb7c':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 29 Aug 2013 14:53:56 +0000 (07:53 -0700)]
am
c7902845: (-s ours) Import translations. DO NOT MERGE
* commit '
c79028454106f4e73702c4bd4dde36a37beca90c':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 29 Aug 2013 14:53:47 +0000 (07:53 -0700)]
am
17d0af91: (-s ours) Import translations. DO NOT MERGE
* commit '
17d0af9160697f0fcb2d33ed4b4e91ad6769141c':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 29 Aug 2013 14:50:35 +0000 (14:50 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Thu, 29 Aug 2013 14:50:25 +0000 (14:50 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Thu, 29 Aug 2013 06:43:04 +0000 (23:43 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iaf20a20f5cdc9d59579f1a901138f26b9a449216
Auto-generated-cl: translation import
Baligh Uddin [Thu, 29 Aug 2013 06:36:55 +0000 (23:36 -0700)]
Import translations. DO NOT MERGE
Change-Id: I778a192cc22364fde11327c0e5e0d92dce6ef965
Auto-generated-cl: translation import
Baligh Uddin [Thu, 29 Aug 2013 06:33:19 +0000 (23:33 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2373253c983b6298e17d38882fc85ada1fd2e6e2
Auto-generated-cl: translation import
Baligh Uddin [Thu, 29 Aug 2013 06:32:03 +0000 (23:32 -0700)]
Import translations. DO NOT MERGE
Change-Id: I7e0a050642f956f175dcb349945089b4515c1bb5
Auto-generated-cl: translation import
Martijn Coenen [Thu, 29 Aug 2013 02:28:17 +0000 (19:28 -0700)]
Update NFC payments to match new framework APIs.
Bug:
10262585
Change-Id: Id4167db50f8e5fe145441bdf73d151a61a8587ed
Amith Yamasani [Thu, 29 Aug 2013 01:11:18 +0000 (18:11 -0700)]
am
637d991e: am
6760f923: Merge "Fix RTL layout of text in Battery history screen" into klp-dev
* commit '
637d991e5e47978cc15ac860f990642c9851f19f':
Fix RTL layout of text in Battery history screen
Amith Yamasani [Thu, 29 Aug 2013 01:07:51 +0000 (18:07 -0700)]
am
6760f923: Merge "Fix RTL layout of text in Battery history screen" into klp-dev
* commit '
6760f92321d2013676863b533606563ed2041648':
Fix RTL layout of text in Battery history screen
Amith Yamasani [Thu, 29 Aug 2013 01:04:10 +0000 (01:04 +0000)]
Merge "Fix RTL layout of text in Battery history screen" into klp-dev
Lifu Tang [Wed, 28 Aug 2013 22:55:49 +0000 (15:55 -0700)]
Fixed the widget location toggle button
- Fix b/
10531669
Change-Id: Iba08d515119c42e5c4de4ee02d6dd8aea404fc69
Lifu Tang [Wed, 28 Aug 2013 22:40:32 +0000 (15:40 -0700)]
am
cc0a9be7: am
dcf2509e: Merge "Disallows setting when user restriction applies" into klp-dev
* commit '
cc0a9be7c988c3ea6229ee55deb0bc969231a927':
Disallows setting when user restriction applies
Lifu Tang [Wed, 28 Aug 2013 22:38:24 +0000 (15:38 -0700)]
am
dcf2509e: Merge "Disallows setting when user restriction applies" into klp-dev
* commit '
dcf2509e75059fcf3f34f82226597681107efb09':
Disallows setting when user restriction applies
Lifu Tang [Wed, 28 Aug 2013 22:29:54 +0000 (22:29 +0000)]
Merge "Disallows setting when user restriction applies" into klp-dev
Amith Yamasani [Wed, 28 Aug 2013 21:15:52 +0000 (14:15 -0700)]
Fix RTL layout of text in Battery history screen
Change the anchor position and alignment direction for text.
Bug:
10447666
Change-Id: Ida4161c738cf9a32cc8ff98037f3755046e64e33
Amith Yamasani [Wed, 28 Aug 2013 21:58:58 +0000 (14:58 -0700)]
am
2c3fedd0: am
079c412d: Merge "Add more fragments to valid list for Wifi activity" into klp-dev
* commit '
2c3fedd0ac621f9dd9c5d84818affeeecfb31cb7':
Add more fragments to valid list for Wifi activity
Amith Yamasani [Wed, 28 Aug 2013 21:54:34 +0000 (14:54 -0700)]
am
079c412d: Merge "Add more fragments to valid list for Wifi activity" into klp-dev
* commit '
079c412def3472fc37750b7f778be3bb03114e38':
Add more fragments to valid list for Wifi activity
Amith Yamasani [Wed, 28 Aug 2013 21:52:59 +0000 (21:52 +0000)]
Merge "Add more fragments to valid list for Wifi activity" into klp-dev
Wink Saville [Wed, 28 Aug 2013 21:26:27 +0000 (14:26 -0700)]
Use MOBILE_PROVISIONING_ACTION for manage mobile plan.
Bug:
10328264
Change-Id: I3925004011bb1243793c4c1b963d923dc2b00cb5
Lifu Tang [Wed, 28 Aug 2013 00:09:55 +0000 (17:09 -0700)]
Disallows setting when user restriction applies
- Fix b/
10116533
Change-Id: Ib171f9545c1651fb36c408decefa47b3d82ba3ab
Amith Yamasani [Wed, 28 Aug 2013 19:38:46 +0000 (12:38 -0700)]
Add more fragments to valid list for Wifi activity
Bug:
10508371
Change-Id: Ic2d2128433ae26ea6750281b978781cb56b97036
Baligh Uddin [Wed, 28 Aug 2013 02:45:32 +0000 (19:45 -0700)]
am
3d0992d8: (-s ours) am
8df4caf1: (-s ours) am
d866be38: (-s ours) am
1caeb5a1: (-s ours) am
d8c9c146: (-s ours) Import translations. DO NOT MERGE
* commit '
3d0992d811e4c94dae4d32fd9915f392543b27a8':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 28 Aug 2013 02:45:31 +0000 (19:45 -0700)]
am
d304be63: (-s ours) am
26a4b208: (-s ours) am
56fc8b77: (-s ours) am
04a25289: (-s ours) Import translations. DO NOT MERGE
* commit '
d304be63421edba7412c11441558eeb5ecb72730':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 28 Aug 2013 02:43:39 +0000 (19:43 -0700)]
am
8df4caf1: (-s ours) am
d866be38: (-s ours) am
1caeb5a1: (-s ours) am
d8c9c146: (-s ours) Import translations. DO NOT MERGE
* commit '
8df4caf168a793d7f17b31ba50e37479b0404022':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 28 Aug 2013 02:43:37 +0000 (19:43 -0700)]
am
26a4b208: (-s ours) am
56fc8b77: (-s ours) am
04a25289: (-s ours) Import translations. DO NOT MERGE
* commit '
26a4b208ef141b64e6cb629c4e7151e365f1c227':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 28 Aug 2013 02:42:22 +0000 (19:42 -0700)]
am
d866be38: (-s ours) am
1caeb5a1: (-s ours) am
d8c9c146: (-s ours) Import translations. DO NOT MERGE
* commit '
d866be382b330ae6c96dfe0de66f2426945b7730':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 28 Aug 2013 02:40:21 +0000 (19:40 -0700)]
am
1caeb5a1: (-s ours) am
d8c9c146: (-s ours) Import translations. DO NOT MERGE
* commit '
1caeb5a11d4846c5db9741c914b1ba53b0af6dc9':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 28 Aug 2013 02:39:03 +0000 (19:39 -0700)]
am
56fc8b77: (-s ours) am
04a25289: (-s ours) Import translations. DO NOT MERGE
* commit '
56fc8b77643411ca8c43b0f3d178c3804de7093b':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 28 Aug 2013 02:38:46 +0000 (19:38 -0700)]
am
3c1f138b: (-s ours) am
f92ee425: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
3c1f138b979bd02884aaefb50a397e2e03334f6c':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 28 Aug 2013 02:37:03 +0000 (19:37 -0700)]
am
04a25289: (-s ours) Import translations. DO NOT MERGE
* commit '
04a252899bdd8a798d1a9c90c2ab45f9efdba5a8':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 28 Aug 2013 02:36:55 +0000 (19:36 -0700)]
am
f92ee425: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
f92ee42545af691b1aa032735009c89d09063a38':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 28 Aug 2013 02:36:48 +0000 (19:36 -0700)]
am
d8c9c146: (-s ours) Import translations. DO NOT MERGE
* commit '
d8c9c146e79636f44808e2514e666f0966cc5596':
Import translations. DO NOT MERGE
OSDN Git Service
