Commit Graph

23116 Commits

Author SHA1 Message Date
Geoff Mendal
8da5906dcb Import translations. DO NOT MERGE am: 3a7368e9c3 -s ours am: 6bdaffa2af -s ours
am: 275a235437  -s ours

* commit '275a235437c3dfe4824cd1ca36aff38c81fa46fb':
  Import translations. DO NOT MERGE
2015-10-20 11:59:56 +00:00
Geoff Mendal
275a235437 Import translations. DO NOT MERGE am: 3a7368e9c3 -s ours
am: 6bdaffa2af  -s ours

* commit '6bdaffa2af987725f54cae246b5ed694720213bb':
  Import translations. DO NOT MERGE
2015-10-20 11:56:07 +00:00
Geoff Mendal
6bdaffa2af Import translations. DO NOT MERGE
am: 3a7368e9c3  -s ours

* commit '3a7368e9c32af8c3245c8effc98de9e75f90f27a':
  Import translations. DO NOT MERGE
2015-10-20 11:52:42 +00:00
Geoff Mendal
3a7368e9c3 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 25001286
Change-Id: Idc0260cd6aead133bb00dc3b62ddd21009a6315c
2015-10-19 21:22:01 -07:00
Jason Monk
8e18934478 Hide SIM and IMEI for wifi only devices am: 417a0500c3 am: 2a90c111ee
am: 554c3aef41

* commit '554c3aef41c089d2baf6f2f6894de14e576f6d45':
  Hide SIM and IMEI for wifi only devices
2015-10-20 03:00:11 +00:00
Jason Monk
554c3aef41 Hide SIM and IMEI for wifi only devices am: 417a0500c3
am: 2a90c111ee

* commit '2a90c111ee994a0b8d95039b102ab280d6ce9d6b':
  Hide SIM and IMEI for wifi only devices
2015-10-20 02:22:55 +00:00
Jason Monk
2a90c111ee Hide SIM and IMEI for wifi only devices
am: 417a0500c3

* commit '417a0500c3d7e14013751dbe62791487b033ee72':
  Hide SIM and IMEI for wifi only devices
2015-10-20 02:05:14 +00:00
Jason Monk
417a0500c3 Hide SIM and IMEI for wifi only devices
Bug: 24342670
Change-Id: Icfb7db0c1b5c6688c16248daa5e6c0443ff45392
2015-10-19 20:02:11 -04:00
Geoff Mendal
edfdeeee30 am b2568ed0: (-s ours) am 35e01bf7: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev am: 84c62dde3d -s ours
* commit 'b2568ed0d1ae4cdaabcb061b2a503fece4aaa22a':
  Import translations. DO NOT MERGE
2015-10-19 14:38:55 +00:00
Geoff Mendal
b2568ed0d1 am 35e01bf7: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev am: 84c62dde3d -s ours
* commit '35e01bf70f560c3651ae34968cd1082cb2dd8536':
  Import translations. DO NOT MERGE
2015-10-19 14:33:34 +00:00
Geoff Mendal
35e01bf70f Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
am: 84c62dde3d  -s ours

* commit '84c62dde3d737e0cc194a24e76dbdac9e8c75170':
  Import translations. DO NOT MERGE
2015-10-19 14:28:59 +00:00
Geoff Mendal
84c62dde3d Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-10-19 14:27:20 +00:00
Geoff Mendal
7f62f29b24 Import translations. DO NOT MERGE
Change-Id: I9068be1f0479a7025a7eacfce03046cd54e3d1a8
Auto-generated-cl: translation import
2015-10-19 07:25:38 -07:00
Geoff Mendal
1c95645b3b am ca059bfb: (-s ours) am 51b43e12: (-s ours) am 99131cf6: (-s ours) am f191953c: (-s ours) Import translations. DO NOT MERGE am: 862568de0d -s ours
* commit 'ca059bfb439df9db2c4ee2f7d860e8a29bf0a91f':
  Import translations. DO NOT MERGE
2015-10-19 13:17:46 +00:00
Geoff Mendal
ca059bfb43 am 51b43e12: (-s ours) am 99131cf6: (-s ours) am f191953c: (-s ours) Import translations. DO NOT MERGE am: 862568de0d -s ours
* commit '51b43e1236fa70711d914d0bc117a1ac745f0172':
  Import translations. DO NOT MERGE
2015-10-19 13:13:08 +00:00
Geoff Mendal
51b43e1236 am 99131cf6: (-s ours) am f191953c: (-s ours) Import translations. DO NOT MERGE
am: 862568de0d  -s ours

* commit '862568de0d722af6f47e02b8c6fbf8efb9d6b6cc':
  Import translations. DO NOT MERGE
2015-10-19 13:09:13 +00:00
Geoff Mendal
862568de0d am 99131cf6: (-s ours) am f191953c: (-s ours) Import translations. DO NOT MERGE
* commit '99131cf64253cf997d8ee6e356843e376a141846':
  Import translations. DO NOT MERGE
2015-10-19 13:04:28 +00:00
Geoff Mendal
99131cf642 am f191953c: (-s ours) Import translations. DO NOT MERGE
* commit 'f191953c77af3c5b78e576a430577aaf050aa5f1':
  Import translations. DO NOT MERGE
2015-10-19 13:01:28 +00:00
Geoff Mendal
f191953c77 Import translations. DO NOT MERGE
Change-Id: Id2b08418cad5acba5716761650814489a2a94234
Auto-generated-cl: translation import
2015-10-19 05:21:10 -07:00
Jason Monk
6d85d1686e am d2975f9d: am d9774c9f: am cdcba9ce: Merge "Fix crashes in Settings" into mnc-dr-dev
* commit 'd2975f9d0c12b46978c2a108961617293eeaba85':
  Fix crashes in Settings
2015-10-16 16:49:38 +00:00
Jason Monk
d2975f9d0c am d9774c9f: am cdcba9ce: Merge "Fix crashes in Settings" into mnc-dr-dev
* commit 'd9774c9f5b4b5e0c51c03795cdc1658d1388ec87':
  Fix crashes in Settings
2015-10-16 16:45:11 +00:00
Jason Monk
d9774c9f5b am cdcba9ce: Merge "Fix crashes in Settings" into mnc-dr-dev
* commit 'cdcba9ce5f44cf4cad9e308919272db4e15e9717':
  Fix crashes in Settings
2015-10-16 16:41:22 +00:00
Jason Monk
cdcba9ce5f Merge "Fix crashes in Settings" into mnc-dr-dev 2015-10-16 16:33:56 +00:00
Jeff Sharkey
bfee8b484f am 31e2ce0e: am d36edb9f: am de005547: Merge "Bail if activity was destroyed." into mnc-dr-dev
* commit '31e2ce0ea617bfe07a5c20d3c2b0433f14531678':
  Bail if activity was destroyed.
2015-10-16 16:29:54 +00:00
Jeff Sharkey
31e2ce0ea6 am d36edb9f: am de005547: Merge "Bail if activity was destroyed." into mnc-dr-dev
* commit 'd36edb9f462ee430d53515e02534e20d92e7a5d0':
  Bail if activity was destroyed.
2015-10-16 16:24:30 +00:00
Jeff Sharkey
d36edb9f46 am de005547: Merge "Bail if activity was destroyed." into mnc-dr-dev
* commit 'de005547bae3799265fdad8f61720a82241f4b07':
  Bail if activity was destroyed.
2015-10-16 16:18:41 +00:00
Jeff Sharkey
de005547ba Merge "Bail if activity was destroyed." into mnc-dr-dev 2015-10-16 16:14:47 +00:00
Jason Monk
77b11fa470 Fix crashes in Settings
Fix problems from unsupported intents being launched through adb.
Remove the ones we can, fix the other.

Bug: 19634064
Change-Id: Iba0adeb135e76ee70365e5891380ba8b55110c26
2015-10-16 10:13:53 -04:00
Amit Mahajan
7b99029832 am f20d51f3: am 6d042a69: am 1704ca96: Merge "Change to add user_visible field to Carriers table." into mnc-dr-dev
* commit 'f20d51f3b02fafb6001e91de8b3d5a15e6222099':
  Change to add user_visible field to Carriers table.
2015-10-14 23:49:08 +00:00
Amit Mahajan
f20d51f3b0 am 6d042a69: am 1704ca96: Merge "Change to add user_visible field to Carriers table." into mnc-dr-dev
* commit '6d042a69aa23db5a50c429e7fcda9dc3327f880d':
  Change to add user_visible field to Carriers table.
2015-10-14 23:42:33 +00:00
Amit Mahajan
6d042a69aa am 1704ca96: Merge "Change to add user_visible field to Carriers table." into mnc-dr-dev
* commit '1704ca968d4566218f159817625f849c1dc34d96':
  Change to add user_visible field to Carriers table.
2015-10-14 23:37:32 +00:00
Amit Mahajan
1704ca968d Merge "Change to add user_visible field to Carriers table." into mnc-dr-dev 2015-10-14 23:33:01 +00:00
Jeff Sharkey
cabb62faf3 Bail if activity was destroyed.
Bug: 24172045
Change-Id: I723951b3478459fc70e29d25386f8d7197964e3d
2015-10-14 14:45:52 -07:00
Erik Kline
38fc400ac9 am 453d52b6: am 51d71aa2: am 583deb52: Merge "Unconfigure the lockdown VPN if the user forgets its profile." into mnc-dr-dev
* commit '453d52b6575ebd97c7b4c962bd3a687c1c163968':
  Unconfigure the lockdown VPN if the user forgets its profile.
2015-10-14 17:55:18 +00:00
Erik Kline
453d52b657 am 51d71aa2: am 583deb52: Merge "Unconfigure the lockdown VPN if the user forgets its profile." into mnc-dr-dev
* commit '51d71aa2bf1f84fffda6b4144520e9a3bad25985':
  Unconfigure the lockdown VPN if the user forgets its profile.
2015-10-14 17:48:50 +00:00
Erik Kline
51d71aa2bf am 583deb52: Merge "Unconfigure the lockdown VPN if the user forgets its profile." into mnc-dr-dev
* commit '583deb524b2d6ed2fd2741c605d5ae02c5c5d52a':
  Unconfigure the lockdown VPN if the user forgets its profile.
2015-10-14 17:42:15 +00:00
Erik Kline
583deb524b Merge "Unconfigure the lockdown VPN if the user forgets its profile." into mnc-dr-dev 2015-10-14 17:37:52 +00:00
Geoff Mendal
63bb6cb9cd am fbcbe2a9: (-s ours) am edbd1cd2: (-s ours) am 74d90b3e: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit 'fbcbe2a97acb490616955f00b9ac295d6eff0360':
  Import translations. DO NOT MERGE
2015-10-14 14:48:36 +00:00
Geoff Mendal
fbcbe2a97a am edbd1cd2: (-s ours) am 74d90b3e: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit 'edbd1cd28a64887279179b69f0a51c05a61212f4':
  Import translations. DO NOT MERGE
2015-10-14 14:43:38 +00:00
Geoff Mendal
edbd1cd28a am 74d90b3e: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '74d90b3e4ed301f910b8e85616e5509822b00c14':
  Import translations. DO NOT MERGE
2015-10-14 14:39:30 +00:00
Geoff Mendal
74d90b3e4e Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-10-14 14:35:49 +00:00
Geoff Mendal
d71db4f50c Import translations. DO NOT MERGE
Change-Id: Ia691930a9cc7c1c69292023b397077faa42494f5
Auto-generated-cl: translation import
2015-10-14 07:34:20 -07:00
Geoff Mendal
338b91f530 am 9535c47b: (-s ours) am 107baf55: (-s ours) am 0884f09a: (-s ours) am 67b0ffc8: (-s ours) am 8b6b589d: (-s ours) am cec2a65a: (-s ours) am 26bb544f: (-s ours) am 46eb1857: (-s ours) Import translations. DO NOT MERGE
* commit '9535c47beae13a0b4e9738ab84c6f7ff649ca76d':
  Import translations. DO NOT MERGE
2015-10-14 13:12:54 +00:00
Geoff Mendal
9535c47bea am 107baf55: (-s ours) am 0884f09a: (-s ours) am 67b0ffc8: (-s ours) am 8b6b589d: (-s ours) am cec2a65a: (-s ours) am 26bb544f: (-s ours) am 46eb1857: (-s ours) Import translations. DO NOT MERGE
* commit '107baf5504d938828b5212eb1bbb06e36945ae49':
  Import translations. DO NOT MERGE
2015-10-14 13:09:26 +00:00
Geoff Mendal
107baf5504 am 0884f09a: (-s ours) am 67b0ffc8: (-s ours) am 8b6b589d: (-s ours) am cec2a65a: (-s ours) am 26bb544f: (-s ours) am 46eb1857: (-s ours) Import translations. DO NOT MERGE
* commit '0884f09acf51b2187abc5ec038590726f6923b29':
  Import translations. DO NOT MERGE
2015-10-14 13:04:12 +00:00
Geoff Mendal
0884f09acf am 67b0ffc8: (-s ours) am 8b6b589d: (-s ours) am cec2a65a: (-s ours) am 26bb544f: (-s ours) am 46eb1857: (-s ours) Import translations. DO NOT MERGE
* commit '67b0ffc88ba0c7effc2f89fb457042bc471b3b98':
  Import translations. DO NOT MERGE
2015-10-14 12:59:54 +00:00
Geoff Mendal
67b0ffc88b am 8b6b589d: (-s ours) am cec2a65a: (-s ours) am 26bb544f: (-s ours) am 46eb1857: (-s ours) Import translations. DO NOT MERGE
* commit '8b6b589dbd43bd30c7a52ad5503a0c6c5beb09b2':
  Import translations. DO NOT MERGE
2015-10-14 12:53:54 +00:00
Geoff Mendal
8b6b589dbd am cec2a65a: (-s ours) am 26bb544f: (-s ours) am 46eb1857: (-s ours) Import translations. DO NOT MERGE
* commit 'cec2a65a98161c6c69e373647f03745c59246097':
  Import translations. DO NOT MERGE
2015-10-14 12:49:34 +00:00
Geoff Mendal
cec2a65a98 am 26bb544f: (-s ours) am 46eb1857: (-s ours) Import translations. DO NOT MERGE
* commit '26bb544ff277020444b79543302b015160ead18a':
  Import translations. DO NOT MERGE
2015-10-14 12:45:51 +00:00
Geoff Mendal
a1641e8143 am e3e4bd7f: (-s ours) am 54158bc7: (-s ours) am d1ba8f73: (-s ours) am c6d5ac0f: (-s ours) am 974dfc1f: (-s ours) Import translations. DO NOT MERGE
* commit 'e3e4bd7f32c30fa131fb84142a9c1cd05771750e':
  Import translations. DO NOT MERGE
2015-10-14 12:43:15 +00:00