Sanket Padawe
ea2e53ead5
am ce1bfbb0: resolved conflicts for merge of 61719a80 to lmp-mr1-dev-plus-aosp
...
* commit 'ce1bfbb04e75a9b4362b2f3070ff4ee5406f136d':
Removing display number format from SIM UI
2014-10-10 05:15:52 +00:00
Sanket Padawe
ce1bfbb04e
resolved conflicts for merge of 61719a80 to lmp-mr1-dev-plus-aosp
...
Change-Id: I3246a5d50f0fa2e324b7c6119a365f8ee9ed2e80
2014-10-09 20:19:59 -07:00
Sanket Padawe
61719a801c
am 04b8b4c1: am e4cbb865: Merge "Removing display number format from SIM UI" into lmp-sprout-dev
...
* commit '04b8b4c1a46dad57923ddbbb1522e8c21d0757f7':
Removing display number format from SIM UI
2014-10-09 13:16:15 +00:00
Sanket Padawe
04b8b4c1a4
am e4cbb865: Merge "Removing display number format from SIM UI" into lmp-sprout-dev
...
* commit 'e4cbb86596dd55200eb1842b66463a70e59a8ee4':
Removing display number format from SIM UI
2014-10-09 13:03:33 +00:00
Sanket Padawe
e4cbb86596
Merge "Removing display number format from SIM UI" into lmp-sprout-dev
2014-10-09 00:33:10 +00:00
Sanket Padawe
770bdd771e
Removing display number format from SIM UI
...
Removed "Display Number" from the SIM settings UI.
Change-Id: Ib2b228931dfac56503ac56ffdf2238e6f416a469
2014-10-08 16:05:36 -07:00
Amith Yamasani
b7a635f66d
am 711785f5: am 436796e4: am 6b911d59: am c55c581a: am 742a6803: Merge "Set default restrictions for a newly created user" into lmp-dev
...
* commit '711785f59cfe9aeb71e686bd7f45781bd545472c':
Set default restrictions for a newly created user
2014-10-07 20:41:15 +00:00
Amith Yamasani
711785f59c
am 436796e4: am 6b911d59: am c55c581a: am 742a6803: Merge "Set default restrictions for a newly created user" into lmp-dev
...
* commit '436796e4ccf327c09e104a5bda27788a029c85e7':
Set default restrictions for a newly created user
2014-10-07 20:34:51 +00:00
Amith Yamasani
436796e4cc
am 6b911d59: am c55c581a: am 742a6803: Merge "Set default restrictions for a newly created user" into lmp-dev
...
* commit '6b911d59eb2da863c53e5e338dec22974a79b654':
Set default restrictions for a newly created user
2014-10-07 20:08:32 +00:00
Amith Yamasani
6b911d59eb
am c55c581a: am 742a6803: Merge "Set default restrictions for a newly created user" into lmp-dev
...
* commit 'c55c581a8a9c7fb777e80498852426a546b1504c':
Set default restrictions for a newly created user
2014-10-07 20:03:26 +00:00
Amith Yamasani
c55c581a8a
am 742a6803: Merge "Set default restrictions for a newly created user" into lmp-dev
...
* commit '742a6803c31692f6cf0b36ef934cf1e9bc9b01d8':
Set default restrictions for a newly created user
2014-10-07 19:58:24 +00:00
Amith Yamasani
742a6803c3
Merge "Set default restrictions for a newly created user" into lmp-dev
2014-10-07 17:41:10 +00:00
Amith Yamasani
a766bfa3de
Set default restrictions for a newly created user
...
Call a different createUser version that sets up the defaults.
Make sure any previously created guest also gets the restrictions
as soon as they are changed.
Bug: 17832802
Bug: 17891763
Change-Id: I3eaa9e3da32b2f436699db24bb7be2668f1480b3
2014-10-07 17:13:16 +00:00
Mike Lockwood
b7597d5bd0
Merge "Add developer setting for changing the current USB configuration"
2014-10-07 17:12:21 +00:00
Geoff Mendal
9861e23e77
Merge "Import translations. DO NOT MERGE"
2014-10-07 12:22:01 +00:00
Geoff Mendal
5a909310d1
am 4813fcdd: (-s ours) am c22f63a7: (-s ours) am a6e09c12: (-s ours) am 237abb0a: (-s ours) am 7096c2dd: (-s ours) Import translations. DO NOT MERGE
...
* commit '4813fcdd98041a39d0a55ac4a5feadd27ea72194':
Import translations. DO NOT MERGE
2014-10-07 01:03:43 +00:00
Geoff Mendal
9d00a09a0a
am ea11d700: (-s ours) am 5df0bf9a: (-s ours) am c4fd0715: (-s ours) am c3cd6d95: (-s ours) Import translations. DO NOT MERGE
...
* commit 'ea11d7007f7cae2c5642a0981cf94b0ec2a524d4':
Import translations. DO NOT MERGE
2014-10-07 01:03:42 +00:00
Geoff Mendal
4813fcdd98
am c22f63a7: (-s ours) am a6e09c12: (-s ours) am 237abb0a: (-s ours) am 7096c2dd: (-s ours) Import translations. DO NOT MERGE
...
* commit 'c22f63a7b47a51e6818001b1472a7dd863c16df1':
Import translations. DO NOT MERGE
2014-10-07 00:56:05 +00:00
Geoff Mendal
ea11d7007f
am 5df0bf9a: (-s ours) am c4fd0715: (-s ours) am c3cd6d95: (-s ours) Import translations. DO NOT MERGE
...
* commit '5df0bf9a34f2891982eacf0e5aa3119f14326f41':
Import translations. DO NOT MERGE
2014-10-07 00:56:04 +00:00
Geoff Mendal
c22f63a7b4
am a6e09c12: (-s ours) am 237abb0a: (-s ours) am 7096c2dd: (-s ours) Import translations. DO NOT MERGE
...
* commit 'a6e09c12d402bc980952ca44648ee0ba5cd50182':
Import translations. DO NOT MERGE
2014-10-07 00:40:13 +00:00
Geoff Mendal
5df0bf9a34
am c4fd0715: (-s ours) am c3cd6d95: (-s ours) Import translations. DO NOT MERGE
...
* commit 'c4fd0715c06b8197ff6f47da5d55f58cc4b336f6':
Import translations. DO NOT MERGE
2014-10-07 00:40:12 +00:00
Geoff Mendal
a6e09c12d4
am 237abb0a: (-s ours) am 7096c2dd: (-s ours) Import translations. DO NOT MERGE
...
* commit '237abb0a373a3f9a9e70e7f11fbc77dd65dcf80f':
Import translations. DO NOT MERGE
2014-10-07 00:32:21 +00:00
Geoff Mendal
c4fd0715c0
am c3cd6d95: (-s ours) Import translations. DO NOT MERGE
...
* commit 'c3cd6d956b2687a99564010b888513250d2ac29d':
Import translations. DO NOT MERGE
2014-10-07 00:32:21 +00:00
Geoff Mendal
b0745fbd7b
am 6380422d: (-s ours) am 3a797b8b: (-s ours) am 78fb9572: (-s ours) Import translations. DO NOT MERGE
...
* commit '6380422d2553cbfb3901654cb68b0134fb4a8794':
Import translations. DO NOT MERGE
2014-10-07 00:25:37 +00:00
Geoff Mendal
25281aecbd
am a5569d48: (-s ours) am b2bd24f1: (-s ours) Import translations. DO NOT MERGE
...
* commit 'a5569d48dd342821a252dcb85b7756d55e2af3c7':
Import translations. DO NOT MERGE
2014-10-07 00:20:58 +00:00
Geoff Mendal
691793a059
Import translations. DO NOT MERGE
...
Change-Id: I78911b5f73395927c6981792f4ec9b0f4e48c236
Auto-generated-cl: translation import
2014-10-06 17:20:48 -07:00
Geoff Mendal
6380422d25
am 3a797b8b: (-s ours) am 78fb9572: (-s ours) Import translations. DO NOT MERGE
...
* commit '3a797b8bdb3f4d68e7483478030f704688169ea6':
Import translations. DO NOT MERGE
2014-10-07 00:18:58 +00:00
Geoff Mendal
a5569d48dd
am b2bd24f1: (-s ours) Import translations. DO NOT MERGE
...
* commit 'b2bd24f195b523538138a594c0c227004886a94d':
Import translations. DO NOT MERGE
2014-10-07 00:13:09 +00:00
Geoff Mendal
3a797b8bdb
am 78fb9572: (-s ours) Import translations. DO NOT MERGE
...
* commit '78fb95728d534a7099c220ea21fc13f3b52afd5f':
Import translations. DO NOT MERGE
2014-10-07 00:11:50 +00:00
Geoff Mendal
237abb0a37
am 7096c2dd: (-s ours) Import translations. DO NOT MERGE
...
* commit '7096c2dd0b1fadabe6f2bcb07ef5045405f2337f':
Import translations. DO NOT MERGE
2014-10-07 00:08:25 +00:00
Geoff Mendal
c3cd6d956b
Import translations. DO NOT MERGE
...
Change-Id: I86bdfc2ed82420c69d8123d82c3e376eef9ff2b1
Auto-generated-cl: translation import
2014-10-06 17:04:43 -07:00
Geoff Mendal
b2bd24f195
Import translations. DO NOT MERGE
...
Change-Id: I6c277439d0c0ffb1f36e56fdad5669c7fbc44c56
Auto-generated-cl: translation import
2014-10-06 17:00:54 -07:00
Geoff Mendal
78fb95728d
Import translations. DO NOT MERGE
...
Change-Id: I24a02b89f2baf4a914ff56381e46f8a326b9ddba
Auto-generated-cl: translation import
2014-10-06 16:57:23 -07:00
Geoff Mendal
7096c2dd0b
Import translations. DO NOT MERGE
...
Change-Id: I081acd53e6011744f1fdf01403290172ac9ab96f
Auto-generated-cl: translation import
2014-10-06 16:53:34 -07:00
Mike Lockwood
3f6ef34b35
Add developer setting for changing the current USB configuration
...
This can be useful for testing the audio source kernel driver,
reverse tethering over RNDIS, etc.
Change-Id: I7392f95545cf5ae8a36b4b7b0d37f003df7e70b2
2014-10-06 10:17:13 -07:00
Baligh Uddin
87a092d965
am ace6ce94: (-s ours) am 04b3b84d: (-s ours) am 44705ba3: (-s ours) am b305e7ad: (-s ours) am 43848de1: (-s ours) Import translations. DO NOT MERGE
...
* commit 'ace6ce943bda08aa155667ac80640d810be2b89f':
Import translations. DO NOT MERGE
2014-10-05 18:34:26 +00:00
Baligh Uddin
ffad172ac6
am 56ee8dda: (-s ours) am c683e91b: (-s ours) am d10da630: (-s ours) am 4aed4235: (-s ours) Import translations. DO NOT MERGE
...
* commit '56ee8dda0d04f64a30ebdc65ce572752facd70e4':
Import translations. DO NOT MERGE
2014-10-05 18:30:05 +00:00
Baligh Uddin
ace6ce943b
am 04b3b84d: (-s ours) am 44705ba3: (-s ours) am b305e7ad: (-s ours) am 43848de1: (-s ours) Import translations. DO NOT MERGE
...
* commit '04b3b84d30d723e71ea501b929f7b4af81e1150d':
Import translations. DO NOT MERGE
2014-10-05 18:29:10 +00:00
Baligh Uddin
9824d874c0
am 2856ab17: (-s ours) am 08edaf4a: (-s ours) am f6a4f3e1: (-s ours) Import translations. DO NOT MERGE
...
* commit '2856ab17ef578ccb42f0ee7324a95121fb28ea7d':
Import translations. DO NOT MERGE
2014-10-05 18:23:50 +00:00
Baligh Uddin
04b3b84d30
am 44705ba3: (-s ours) am b305e7ad: (-s ours) am 43848de1: (-s ours) Import translations. DO NOT MERGE
...
* commit '44705ba3c254b62c8ab95ef5d05a5c1e3c8c0a75':
Import translations. DO NOT MERGE
2014-10-05 18:23:42 +00:00
Baligh Uddin
56ee8dda0d
am c683e91b: (-s ours) am d10da630: (-s ours) am 4aed4235: (-s ours) Import translations. DO NOT MERGE
...
* commit 'c683e91b14d2e8826ba1d6f81abb8cc70117699f':
Import translations. DO NOT MERGE
2014-10-05 18:21:41 +00:00
Baligh Uddin
d913b41eec
am a0f460e4: (-s ours) am 44a32145: (-s ours) Import translations. DO NOT MERGE
...
* commit 'a0f460e47fad94cad4ffec0ed618e9af091a82fd':
Import translations. DO NOT MERGE
2014-10-05 18:19:28 +00:00
Baligh Uddin
44705ba3c2
am b305e7ad: (-s ours) am 43848de1: (-s ours) Import translations. DO NOT MERGE
...
* commit 'b305e7adecfafbcfd0c41354750dd2a77c3fdfa9':
Import translations. DO NOT MERGE
2014-10-05 18:17:26 +00:00
Baligh Uddin
2856ab17ef
am 08edaf4a: (-s ours) am f6a4f3e1: (-s ours) Import translations. DO NOT MERGE
...
* commit '08edaf4a15d4b7e3f90902ed952b9ce3cf5b863f':
Import translations. DO NOT MERGE
2014-10-05 18:16:35 +00:00
Baligh Uddin
c683e91b14
am d10da630: (-s ours) am 4aed4235: (-s ours) Import translations. DO NOT MERGE
...
* commit 'd10da630cbb1998d900033cdbd00b0f88cec3f57':
Import translations. DO NOT MERGE
2014-10-05 18:14:49 +00:00
Baligh Uddin
a0f460e47f
am 44a32145: (-s ours) Import translations. DO NOT MERGE
...
* commit '44a32145ca9400540c2fe82cad265bceb60d5f05':
Import translations. DO NOT MERGE
2014-10-05 18:12:01 +00:00
Baligh Uddin
b305e7adec
am 43848de1: (-s ours) Import translations. DO NOT MERGE
...
* commit '43848de1603dc30e390049e2057285303132a836':
Import translations. DO NOT MERGE
2014-10-05 18:10:55 +00:00
Baligh Uddin
08edaf4a15
am f6a4f3e1: (-s ours) Import translations. DO NOT MERGE
...
* commit 'f6a4f3e1eaa98a2c39732d0900996664e0256622':
Import translations. DO NOT MERGE
2014-10-05 18:10:03 +00:00
Baligh Uddin
d10da630cb
am 4aed4235: (-s ours) Import translations. DO NOT MERGE
...
* commit '4aed423562538583076fe3568bdd01a613d5b36f':
Import translations. DO NOT MERGE
2014-10-05 18:09:22 +00:00
Baligh Uddin
34fcad201f
Merge "Import translations. DO NOT MERGE"
2014-10-05 18:06:25 +00:00