PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,556 Commits 1 Branch 0 Tags
d5c71fc4e613d80d1ff8c128f29d9c201bcb3f90
Commit Graph

10556 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wink Saville
d5c71fc4e6 am e38165ca: am 7bee4c29: Use correct action string for provisioning. 
* commit 'e38165caf08a164999b9518dd1f16c9f94d581e9':
  Use correct action string for provisioning.
 2013-08-29 20:42:59 -07:00
Wink Saville
e38165caf0 am 7bee4c29: Use correct action string for provisioning. 
* commit '7bee4c294204be49edf58e9251726425ffcc5748':
  Use correct action string for provisioning.
 2013-08-29 20:41:04 -07:00
Wink Saville
7bee4c2942 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
 2013-08-29 19:58:09 -07:00
Wink Saville
1bc2db2221 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.
 2013-08-29 11:57:48 -07:00
Wink Saville
0e042a44a8 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.
 2013-08-29 10:23:04 -07:00
Wink Saville
289c2f0d30 Merge "Use MOBILE_PROVISIONING_ACTION for manage mobile plan." into jb-mr2-dev 2013-08-29 17:20:29 +00:00
Baligh Uddin
f7b5ad80a8 am da7395d6: (-s ours) am c7902845: (-s ours) Import translations. DO NOT MERGE 
* commit 'da7395d6c5a92738c2e7130590f30a536ec94b54':
  Import translations. DO NOT MERGE
 2013-08-29 07:57:04 -07:00
Baligh Uddin
da7395d6c5 am c7902845: (-s ours) Import translations. DO NOT MERGE 
* commit 'c79028454106f4e73702c4bd4dde36a37beca90c':
  Import translations. DO NOT MERGE
 2013-08-29 07:53:56 -07:00
Baligh Uddin
439b154311 am 17d0af91: (-s ours) Import translations. DO NOT MERGE 
* commit '17d0af9160697f0fcb2d33ed4b4e91ad6769141c':
  Import translations. DO NOT MERGE
 2013-08-29 07:53:47 -07:00
Baligh Uddin
17d0af9160 Import translations. DO NOT MERGE 
Change-Id: I2373253c983b6298e17d38882fc85ada1fd2e6e2
Auto-generated-cl: translation import
 2013-08-28 23:33:19 -07:00
Baligh Uddin
c790284541 Import translations. DO NOT MERGE 
Change-Id: I7e0a050642f956f175dcb349945089b4515c1bb5
Auto-generated-cl: translation import
 2013-08-28 23:32:03 -07:00
Wink Saville
bb77bf22d5 Use MOBILE_PROVISIONING_ACTION for manage mobile plan. 
Bug: 10328264
Change-Id: I3925004011bb1243793c4c1b963d923dc2b00cb5
 2013-08-28 14:26:27 -07:00
Baligh Uddin
d866be382b am 1caeb5a1: (-s ours) am d8c9c146: (-s ours) Import translations. DO NOT MERGE 
* commit '1caeb5a11d4846c5db9741c914b1ba53b0af6dc9':
  Import translations. DO NOT MERGE
 2013-08-27 19:40:21 -07:00
Baligh Uddin
56fc8b7764 am 04a25289: (-s ours) Import translations. DO NOT MERGE 
* commit '04a252899bdd8a798d1a9c90c2ab45f9efdba5a8':
  Import translations. DO NOT MERGE
 2013-08-27 19:37:03 -07:00
Baligh Uddin
1caeb5a11d am d8c9c146: (-s ours) Import translations. DO NOT MERGE 
* commit 'd8c9c146e79636f44808e2514e666f0966cc5596':
  Import translations. DO NOT MERGE
 2013-08-27 19:36:48 -07:00
Baligh Uddin
04a252899b Import translations. DO NOT MERGE 
Change-Id: I46db6a6657e5528bbb4a84187f9b271baf644843
Auto-generated-cl: translation import
 2013-08-26 13:55:54 -07:00
Baligh Uddin
d8c9c146e7 Import translations. DO NOT MERGE 
Change-Id: Iddf40541878ef237a1890dad5c3d16e4132d6dde
Auto-generated-cl: translation import
 2013-08-26 13:54:28 -07:00
Baligh Uddin
06de368067 am 56c597c1: (-s ours) am bf65bf49: (-s ours) Import translations. DO NOT MERGE 
* commit '56c597c1b3c5a7d7d2f4e6e26c76c77b9e36120e':
  Import translations. DO NOT MERGE
 2013-08-22 10:59:01 -07:00
Baligh Uddin
56c597c1b3 am bf65bf49: (-s ours) Import translations. DO NOT MERGE 
* commit 'bf65bf49cba2addbcfef81dcea87b27593b9e083':
  Import translations. DO NOT MERGE
 2013-08-22 10:55:45 -07:00
Baligh Uddin
f3381a80bd am f23da91e: (-s ours) Import translations. DO NOT MERGE 
* commit 'f23da91e52169b920fb21a10ff76d617117d5f95':
  Import translations. DO NOT MERGE
 2013-08-22 10:55:44 -07:00
Baligh Uddin
f23da91e52 Import translations. DO NOT MERGE 
Change-Id: Iac08e7012b0da2da09077d0eaeda93b42473d14f
Auto-generated-cl: translation import
 2013-08-21 16:04:35 -07:00
Baligh Uddin
bf65bf49cb Import translations. DO NOT MERGE 
Change-Id: Idc054aa50da72b31b8c75270bff2739ef541af01
Auto-generated-cl: translation import
 2013-08-21 16:03:04 -07:00
Baligh Uddin
1df37ff1b1 am 2b851859: (-s ours) am b09878b8: (-s ours) Import translations. DO NOT MERGE 
* commit '2b85185988eec44b6fdd3ee072d44b0a7a72d432':
  Import translations. DO NOT MERGE
 2013-08-19 13:04:58 -07:00
Baligh Uddin
2b85185988 am b09878b8: (-s ours) Import translations. DO NOT MERGE 
* commit 'b09878b85044df1032eb4612b3165216388165ac':
  Import translations. DO NOT MERGE
 2013-08-19 13:01:53 -07:00
Baligh Uddin
5c60179107 am 8485f115: (-s ours) Import translations. DO NOT MERGE 
* commit '8485f115d25968c0fa3ab9d1ea42d2751422feb5':
  Import translations. DO NOT MERGE
 2013-08-19 13:00:37 -07:00
Baligh Uddin
21cbd017a3 am e37538b1: (-s ours) am 8c6de9e0: (-s ours) Import translations. DO NOT MERGE 
* commit 'e37538b122199f316b8b8eb76a6445de6f5c83be':
  Import translations. DO NOT MERGE
 2013-08-19 13:00:36 -07:00
Baligh Uddin
8485f115d2 Import translations. DO NOT MERGE 
Change-Id: Id76ef34b16fb0979b5b86c5e04b60e0d3088c54a
Auto-generated-cl: translation import
 2013-08-19 12:04:34 -07:00
Baligh Uddin
b09878b850 Import translations. DO NOT MERGE 
Change-Id: I3c136ce6349c35f3cec69d12f355daaf1e8912b5
Auto-generated-cl: translation import
 2013-08-19 12:03:06 -07:00
Baligh Uddin
e37538b122 am 8c6de9e0: (-s ours) Import translations. DO NOT MERGE 
* commit '8c6de9e052810aeec7a347bd015e7e8bf2c337cc':
  Import translations. DO NOT MERGE
 2013-08-15 17:48:11 -07:00
Baligh Uddin
a7238c18b0 am dbf26e70: (-s ours) Import translations. DO NOT MERGE 
* commit 'dbf26e70a1f546f9e198a72b2218ae99b015c9e6':
  Import translations. DO NOT MERGE
 2013-08-15 17:48:05 -07:00
Baligh Uddin
dbf26e70a1 Import translations. DO NOT MERGE 
Change-Id: I9d761d078fd6bc6a07998e3e439242eab9ea0c14
Auto-generated-cl: translation import
 2013-08-14 14:44:15 -07:00
Baligh Uddin
8c6de9e052 Import translations. DO NOT MERGE 
Change-Id: Ia45a89a6f426413ccca221aba0d34e597cdb4ec7
Auto-generated-cl: translation import
 2013-08-14 14:42:52 -07:00
Baligh Uddin
508997ad07 am 728da455: (-s ours) am 03ae9bf0: (-s ours) Import translations. DO NOT MERGE 
* commit '728da4558087e5b3fe25fad7eedb4f5de5c4068f':
  Import translations. DO NOT MERGE
 2013-08-13 00:45:32 -07:00
Baligh Uddin
728da45580 am 03ae9bf0: (-s ours) Import translations. DO NOT MERGE 
* commit '03ae9bf0e90c02ec1afcd13c9993d2d9672eb36f':
  Import translations. DO NOT MERGE
 2013-08-13 00:42:15 -07:00
Baligh Uddin
08f1d439c7 am 05404105: (-s ours) Import translations. DO NOT MERGE 
* commit '054041058f9706c95b3d72ca421fcb656ad59d1e':
  Import translations. DO NOT MERGE
 2013-08-13 00:42:11 -07:00
Baligh Uddin
054041058f Import translations. DO NOT MERGE 
Change-Id: Ic75004da530d9dd114beb02d72928b2204f07b0e
Auto-generated-cl: translation import
 2013-08-12 11:48:59 -07:00
Baligh Uddin
03ae9bf0e9 Import translations. DO NOT MERGE 
Change-Id: I1f8effde31afbf4145ae6b234f0e02e08f9cb882
Auto-generated-cl: translation import
 2013-08-12 11:47:40 -07:00
Baligh Uddin
7256942bb7 am d01ca3ce: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr2-ub-dev 
* commit 'd01ca3ce4a5b93dc0dad46ad0674d6b28d89b0ee':
  Import translations. DO NOT MERGE
 2013-08-07 10:28:43 -07:00
Baligh Uddin
d01ca3ce4a Merge "Import translations. DO NOT MERGE" into jb-mr2-ub-dev 2013-08-07 17:24:07 +00:00
The Android Open Source Project
f4316f6d5b Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge 
Change-Id: I84e2f72513f3087ff4628a838efcf471e3695934
 2013-08-07 09:43:18 -07:00
Baligh Uddin
3bf09a9f84 Import translations. DO NOT MERGE 
Change-Id: I29d9c2b04800f28cd880e1470dca0d25ae74470f
Auto-generated-cl: translation import

Conflicts:
	res/values-nl/strings.xml
	res/values-sw/strings.xml
 2013-08-06 20:44:56 -07:00
Dianne Hackborn
703f8e9629 Fix issue #10190597: "Any permission restrictions" is displayed after a... 
...newline in "Reset app preferences" dialog

Change-Id: I3125155d992af0654175659294bfb2fb325ccb57
 2013-08-06 20:37:43 -07:00
Dianne Hackborn
2965215c6e Reset app preferences now resets all app ops. 
Change-Id: I7966245b5f322f55e139b2da661c02cd58530f11
 2013-08-06 20:37:33 -07:00
Baligh Uddin
d4c6b22188 Import translations. DO NOT MERGE 
Change-Id: I29d9c2b04800f28cd880e1470dca0d25ae74470f
Auto-generated-cl: translation import
 2013-08-06 20:10:13 -07:00
Dianne Hackborn
79f49fc878 Fix issue #10190597: "Any permission restrictions" is displayed after a... 
...newline in "Reset app preferences" dialog

Change-Id: I3125155d992af0654175659294bfb2fb325ccb57
 2013-08-06 20:10:05 -07:00
Baligh Uddin
b4d720f9d7 am 9a53339d: (-s ours) am e211fd11: (-s ours) Import translations. DO NOT MERGE 
* commit '9a53339dd6ea5c683629a5fff8837e7e59581680':
  Import translations. DO NOT MERGE
 2013-08-06 20:05:46 -07:00
Baligh Uddin
9a53339dd6 am e211fd11: (-s ours) Import translations. DO NOT MERGE 
* commit 'e211fd11c65c7db4e0225c774519604efa98889c':
  Import translations. DO NOT MERGE
 2013-08-06 20:04:13 -07:00
Baligh Uddin
e211fd11c6 Import translations. DO NOT MERGE 
Change-Id: I29d9c2b04800f28cd880e1470dca0d25ae74470f
Auto-generated-cl: translation import
 2013-08-06 19:55:54 -07:00
Baligh Uddin
8c9f3fe405 Import translations. DO NOT MERGE 
Change-Id: I271a9cdad27f7f5761cc16e14db5b512902d9b97
Auto-generated-cl: translation import
 2013-08-05 21:43:40 -07:00
Dianne Hackborn
9a4f4656d7 am a5ac281d: am 40557800: Fix issue #10190597: "Any permission restrictions" is displayed after a... 
* commit 'a5ac281db7103aef790a6141cd72fdbc22835552':
  Fix issue #10190597: "Any permission restrictions" is displayed after a...
 2013-08-05 16:49:02 -07:00