OSDN Git Service
Jeff Sharkey [Tue, 20 Oct 2015 18:30:09 +0000 (18:30 +0000)]
Merge "Clamp large data usage values." into mnc-dr-dev am:
29b0ea2dbf am:
a8bd650e81
am:
10338550c4
* commit '
10338550c42421595896377f68545df1f8a93644':
Clamp large data usage values.
Jeff Sharkey [Tue, 20 Oct 2015 17:48:14 +0000 (17:48 +0000)]
Merge "Clamp large data usage values." into mnc-dr-dev am:
29b0ea2dbf
am:
a8bd650e81
* commit '
a8bd650e810178358251e3099f949af8422d5a24':
Clamp large data usage values.
Jeff Sharkey [Tue, 20 Oct 2015 17:32:47 +0000 (17:32 +0000)]
Merge "Clamp large data usage values." into mnc-dr-dev
am:
29b0ea2dbf
* commit '
29b0ea2dbf8f0a31d02af8a4ce17753c9499b167':
Clamp large data usage values.
Jeff Sharkey [Tue, 20 Oct 2015 17:21:43 +0000 (17:21 +0000)]
Merge "Clamp large data usage values." into mnc-dr-dev
Geoff Mendal [Tue, 20 Oct 2015 11:59:56 +0000 (11:59 +0000)]
Import translations. DO NOT MERGE am:
3a7368e9c3 -s ours am:
6bdaffa2af -s ours
am:
275a235437 -s ours
* commit '
275a235437c3dfe4824cd1ca36aff38c81fa46fb':
Import translations. DO NOT MERGE
Geoff Mendal [Tue, 20 Oct 2015 11:56:07 +0000 (11:56 +0000)]
Import translations. DO NOT MERGE am:
3a7368e9c3 -s ours
am:
6bdaffa2af -s ours
* commit '
6bdaffa2af987725f54cae246b5ed694720213bb':
Import translations. DO NOT MERGE
Geoff Mendal [Tue, 20 Oct 2015 11:52:42 +0000 (11:52 +0000)]
Import translations. DO NOT MERGE
am:
3a7368e9c3 -s ours
* commit '
3a7368e9c32af8c3245c8effc98de9e75f90f27a':
Import translations. DO NOT MERGE
Geoff Mendal [Tue, 20 Oct 2015 04:22:01 +0000 (21:22 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
25001286
Change-Id: Idc0260cd6aead133bb00dc3b62ddd21009a6315c
Jason Monk [Tue, 20 Oct 2015 03:00:11 +0000 (03:00 +0000)]
Hide SIM and IMEI for wifi only devices am:
417a0500c3 am:
2a90c111ee
am:
554c3aef41
* commit '
554c3aef41c089d2baf6f2f6894de14e576f6d45':
Hide SIM and IMEI for wifi only devices
Jason Monk [Tue, 20 Oct 2015 02:22:55 +0000 (02:22 +0000)]
Hide SIM and IMEI for wifi only devices am:
417a0500c3
am:
2a90c111ee
* commit '
2a90c111ee994a0b8d95039b102ab280d6ce9d6b':
Hide SIM and IMEI for wifi only devices
Jason Monk [Tue, 20 Oct 2015 02:05:14 +0000 (02:05 +0000)]
Hide SIM and IMEI for wifi only devices
am:
417a0500c3
* commit '
417a0500c3d7e14013751dbe62791487b033ee72':
Hide SIM and IMEI for wifi only devices
Jason Monk [Mon, 19 Oct 2015 23:48:15 +0000 (19:48 -0400)]
Hide SIM and IMEI for wifi only devices
Bug:
24342670
Change-Id: Icfb7db0c1b5c6688c16248daa5e6c0443ff45392
Jeff Sharkey [Mon, 19 Oct 2015 23:41:53 +0000 (16:41 -0700)]
Clamp large data usage values.
Without clamping, they can wrap around to negative values and cause
all sorts of havok. 1TB ought to be enough for anyone: that's 3Mbps
for a solid month.
Bug:
24555152
Change-Id: If92c87f9920c3f05cd3ff2cc6630b1bbb65335b8
Geoff Mendal [Mon, 19 Oct 2015 14:38:55 +0000 (14:38 +0000)]
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
Geoff Mendal [Mon, 19 Oct 2015 14:33:34 +0000 (14:33 +0000)]
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
Geoff Mendal [Mon, 19 Oct 2015 14:28:59 +0000 (14:28 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
am:
84c62dde3d -s ours
* commit '
84c62dde3d737e0cc194a24e76dbdac9e8c75170':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 19 Oct 2015 14:27:20 +0000 (14:27 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Geoff Mendal [Mon, 19 Oct 2015 14:25:38 +0000 (07:25 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9068be1f0479a7025a7eacfce03046cd54e3d1a8
Auto-generated-cl: translation import
Geoff Mendal [Mon, 19 Oct 2015 13:17:46 +0000 (13:17 +0000)]
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
Geoff Mendal [Mon, 19 Oct 2015 13:13:08 +0000 (13:13 +0000)]
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
Geoff Mendal [Mon, 19 Oct 2015 13:09:13 +0000 (13:09 +0000)]
am
99131cf6: (-s ours) am
f191953c: (-s ours) Import translations. DO NOT MERGE
am:
862568de0d -s ours
* commit '
862568de0d722af6f47e02b8c6fbf8efb9d6b6cc':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 19 Oct 2015 13:04:28 +0000 (13:04 +0000)]
am
99131cf6: (-s ours) am
f191953c: (-s ours) Import translations. DO NOT MERGE
* commit '
99131cf64253cf997d8ee6e356843e376a141846':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 19 Oct 2015 13:01:28 +0000 (13:01 +0000)]
am
f191953c: (-s ours) Import translations. DO NOT MERGE
* commit '
f191953c77af3c5b78e576a430577aaf050aa5f1':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 19 Oct 2015 12:21:10 +0000 (05:21 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id2b08418cad5acba5716761650814489a2a94234
Auto-generated-cl: translation import
Jason Monk [Fri, 16 Oct 2015 16:49:38 +0000 (16:49 +0000)]
am
d2975f9d: am
d9774c9f: am
cdcba9ce: Merge "Fix crashes in Settings" into mnc-dr-dev
* commit '
d2975f9d0c12b46978c2a108961617293eeaba85':
Fix crashes in Settings
Jason Monk [Fri, 16 Oct 2015 16:45:11 +0000 (16:45 +0000)]
am
d9774c9f: am
cdcba9ce: Merge "Fix crashes in Settings" into mnc-dr-dev
* commit '
d9774c9f5b4b5e0c51c03795cdc1658d1388ec87':
Fix crashes in Settings
Jason Monk [Fri, 16 Oct 2015 16:41:22 +0000 (16:41 +0000)]
am
cdcba9ce: Merge "Fix crashes in Settings" into mnc-dr-dev
* commit '
cdcba9ce5f44cf4cad9e308919272db4e15e9717':
Fix crashes in Settings
Jason Monk [Fri, 16 Oct 2015 16:33:56 +0000 (16:33 +0000)]
Merge "Fix crashes in Settings" into mnc-dr-dev
Jeff Sharkey [Fri, 16 Oct 2015 16:29:54 +0000 (16:29 +0000)]
am
31e2ce0e: am
d36edb9f: am
de005547: Merge "Bail if activity was destroyed." into mnc-dr-dev
* commit '
31e2ce0ea617bfe07a5c20d3c2b0433f14531678':
Bail if activity was destroyed.
Jeff Sharkey [Fri, 16 Oct 2015 16:24:30 +0000 (16:24 +0000)]
am
d36edb9f: am
de005547: Merge "Bail if activity was destroyed." into mnc-dr-dev
* commit '
d36edb9f462ee430d53515e02534e20d92e7a5d0':
Bail if activity was destroyed.
Jeff Sharkey [Fri, 16 Oct 2015 16:18:41 +0000 (16:18 +0000)]
am
de005547: Merge "Bail if activity was destroyed." into mnc-dr-dev
* commit '
de005547bae3799265fdad8f61720a82241f4b07':
Bail if activity was destroyed.
Jeff Sharkey [Fri, 16 Oct 2015 16:14:47 +0000 (16:14 +0000)]
Merge "Bail if activity was destroyed." into mnc-dr-dev
Jason Monk [Fri, 16 Oct 2015 14:13:53 +0000 (10:13 -0400)]
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
Amit Mahajan [Wed, 14 Oct 2015 23:49:08 +0000 (23:49 +0000)]
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.
Amit Mahajan [Wed, 14 Oct 2015 23:42:33 +0000 (23:42 +0000)]
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.
Amit Mahajan [Wed, 14 Oct 2015 23:37:32 +0000 (23:37 +0000)]
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.
Amit Mahajan [Wed, 14 Oct 2015 23:33:01 +0000 (23:33 +0000)]
Merge "Change to add user_visible field to Carriers table." into mnc-dr-dev
Jeff Sharkey [Wed, 14 Oct 2015 21:45:52 +0000 (14:45 -0700)]
Bail if activity was destroyed.
Bug:
24172045
Change-Id: I723951b3478459fc70e29d25386f8d7197964e3d
Erik Kline [Wed, 14 Oct 2015 17:55:18 +0000 (17:55 +0000)]
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.
Erik Kline [Wed, 14 Oct 2015 17:48:50 +0000 (17:48 +0000)]
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.
Erik Kline [Wed, 14 Oct 2015 17:42:15 +0000 (17:42 +0000)]
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.
Erik Kline [Wed, 14 Oct 2015 17:37:52 +0000 (17:37 +0000)]
Merge "Unconfigure the lockdown VPN if the user forgets its profile." into mnc-dr-dev
Geoff Mendal [Wed, 14 Oct 2015 14:48:36 +0000 (14:48 +0000)]
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
Geoff Mendal [Wed, 14 Oct 2015 14:43:38 +0000 (14:43 +0000)]
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
Geoff Mendal [Wed, 14 Oct 2015 14:39:30 +0000 (14:39 +0000)]
am
74d90b3e: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
74d90b3e4ed301f910b8e85616e5509822b00c14':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 14 Oct 2015 14:35:49 +0000 (14:35 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Geoff Mendal [Wed, 14 Oct 2015 14:34:20 +0000 (07:34 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia691930a9cc7c1c69292023b397077faa42494f5
Auto-generated-cl: translation import
Geoff Mendal [Wed, 14 Oct 2015 13:12:54 +0000 (13:12 +0000)]
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
Geoff Mendal [Wed, 14 Oct 2015 13:09:26 +0000 (13:09 +0000)]
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
Geoff Mendal [Wed, 14 Oct 2015 13:04:12 +0000 (13:04 +0000)]
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
Geoff Mendal [Wed, 14 Oct 2015 12:59:54 +0000 (12:59 +0000)]
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
Geoff Mendal [Wed, 14 Oct 2015 12:53:54 +0000 (12:53 +0000)]
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
Geoff Mendal [Wed, 14 Oct 2015 12:49:34 +0000 (12:49 +0000)]
am
cec2a65a: (-s ours) am
26bb544f: (-s ours) am
46eb1857: (-s ours) Import translations. DO NOT MERGE
* commit '
cec2a65a98161c6c69e373647f03745c59246097':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 14 Oct 2015 12:45:51 +0000 (12:45 +0000)]
am
26bb544f: (-s ours) am
46eb1857: (-s ours) Import translations. DO NOT MERGE
* commit '
26bb544ff277020444b79543302b015160ead18a':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 14 Oct 2015 12:43:15 +0000 (12:43 +0000)]
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
Geoff Mendal [Wed, 14 Oct 2015 12:40:45 +0000 (12:40 +0000)]
am
46eb1857: (-s ours) Import translations. DO NOT MERGE
* commit '
46eb1857b6ba487d3b6e4fb449ca18b8656a51d7':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 14 Oct 2015 12:38:52 +0000 (12:38 +0000)]
am
54158bc7: (-s ours) am
d1ba8f73: (-s ours) am
c6d5ac0f: (-s ours) am
974dfc1f: (-s ours) Import translations. DO NOT MERGE
* commit '
54158bc74debbe76637077cb354d910cfcf8ef01':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 14 Oct 2015 12:34:05 +0000 (12:34 +0000)]
am
d1ba8f73: (-s ours) am
c6d5ac0f: (-s ours) am
974dfc1f: (-s ours) Import translations. DO NOT MERGE
* commit '
d1ba8f73cebeedf4da291db868afddd34ba94092':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 14 Oct 2015 12:30:54 +0000 (05:30 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8e182bafdc9327ed8097cc26294de58783112d62
Auto-generated-cl: translation import
Geoff Mendal [Wed, 14 Oct 2015 12:30:14 +0000 (12:30 +0000)]
am
c6d5ac0f: (-s ours) am
974dfc1f: (-s ours) Import translations. DO NOT MERGE
* commit '
c6d5ac0fb71fdeefb5eaee8dbd83f9e34e84ba91':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 14 Oct 2015 12:23:45 +0000 (12:23 +0000)]
am
974dfc1f: (-s ours) Import translations. DO NOT MERGE
* commit '
974dfc1fbd8cedae3c3ff48c35082ee7efa90a3a':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 14 Oct 2015 12:17:15 +0000 (05:17 -0700)]
Import translations. DO NOT MERGE
Change-Id: I01aed0db8e7a6e11ba4b2bd204d42bee53ccf586
Auto-generated-cl: translation import
Lorenzo Colitti [Tue, 13 Oct 2015 06:23:38 +0000 (15:23 +0900)]
Unconfigure the lockdown VPN if the user forgets its profile.
Currently, if the user clicks "forget" on the configuration
dialog for the profile that is currently being used by the
always-on VPN, we don't disable the lockdown VPN, and we crash
on next boot because ConnectivityService tries to start
LockdownVpnTracker with an invalid configuration.
Fix this by removing the LOCKDOWN_VPN variable in the keystore
(which disables the always-on VPN), and notifying
ConnectivityService.
Bug:
23625458
Change-Id: I3545286c9fc23517306aa94607a4b2cb55cc56c4
Geoff Mendal [Tue, 13 Oct 2015 00:19:23 +0000 (00:19 +0000)]
am
56b7a690: (-s ours) am
14bd3435: (-s ours) am
c16b10ea: (-s ours) Import translations. DO NOT MERGE
* commit '
56b7a690d1e4ca8bf50347b72f6dc2222d326db2':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 12 Oct 2015 19:42:31 +0000 (19:42 +0000)]
am
14bd3435: (-s ours) am
c16b10ea: (-s ours) Import translations. DO NOT MERGE
* commit '
14bd3435f306d0ece1715c8bd32e843d0f836fdd':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 12 Oct 2015 19:36:14 +0000 (19:36 +0000)]
am
c16b10ea: (-s ours) Import translations. DO NOT MERGE
* commit '
c16b10ea6bc544c3707adfada28b68c98aea5bb4':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 12 Oct 2015 19:24:07 +0000 (12:24 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Change-Id: I324bc1847519b9058a6951a6ef63e5668e9746ba
Geoff Mendal [Mon, 12 Oct 2015 14:58:21 +0000 (14:58 +0000)]
am
93c6f4fc: (-s ours) am
20625ebc: (-s ours) am
49848a63: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
93c6f4fc3a0459bad43efd02097c3f133cc0679b':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 12 Oct 2015 14:54:45 +0000 (14:54 +0000)]
am
20625ebc: (-s ours) am
49848a63: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
20625ebc5ba22b7b0d9a38a79a9a70e12143f6e2':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 12 Oct 2015 14:49:06 +0000 (14:49 +0000)]
am
49848a63: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
49848a637a341d64317b0fcb371ca695919a8cd1':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 12 Oct 2015 14:43:57 +0000 (14:43 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Geoff Mendal [Mon, 12 Oct 2015 14:43:01 +0000 (07:43 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ib419916b4455d3b42a8a8b2395c14dba9afcc8a3
Auto-generated-cl: translation import
Geoff Mendal [Mon, 12 Oct 2015 13:27:09 +0000 (13:27 +0000)]
am
7f15902c: (-s ours) am
f999d572: (-s ours) am
c123f953: (-s ours) am
4accfd0b: (-s ours) am
1bd19dd1: (-s ours) am
0e3ffe7c: (-s ours) am
5fa0a93d: (-s ours) am
4fedc0fd: (-s ours) Import translations. DO NOT MERGE
* commit '
7f15902c4bfaf2c74f7702cb68af03e9f9d08008':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 12 Oct 2015 13:22:50 +0000 (13:22 +0000)]
am
f999d572: (-s ours) am
c123f953: (-s ours) am
4accfd0b: (-s ours) am
1bd19dd1: (-s ours) am
0e3ffe7c: (-s ours) am
5fa0a93d: (-s ours) am
4fedc0fd: (-s ours) Import translations. DO NOT MERGE
* commit '
f999d57278db3c12ce0911d83781978f657f8ede':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 12 Oct 2015 13:17:48 +0000 (13:17 +0000)]
am
c123f953: (-s ours) am
4accfd0b: (-s ours) am
1bd19dd1: (-s ours) am
0e3ffe7c: (-s ours) am
5fa0a93d: (-s ours) am
4fedc0fd: (-s ours) Import translations. DO NOT MERGE
* commit '
c123f953007aefb7297b399eb03397d1a7406593':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 12 Oct 2015 13:14:14 +0000 (13:14 +0000)]
am
4accfd0b: (-s ours) am
1bd19dd1: (-s ours) am
0e3ffe7c: (-s ours) am
5fa0a93d: (-s ours) am
4fedc0fd: (-s ours) Import translations. DO NOT MERGE
* commit '
4accfd0b121d2b258bca301b16f62c1ac760d89c':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 12 Oct 2015 13:11:42 +0000 (13:11 +0000)]
am
1bd19dd1: (-s ours) am
0e3ffe7c: (-s ours) am
5fa0a93d: (-s ours) am
4fedc0fd: (-s ours) Import translations. DO NOT MERGE
* commit '
1bd19dd17e2038df6c374ca6ed48498de4dde730':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 12 Oct 2015 13:04:48 +0000 (13:04 +0000)]
am
0e3ffe7c: (-s ours) am
5fa0a93d: (-s ours) am
4fedc0fd: (-s ours) Import translations. DO NOT MERGE
* commit '
0e3ffe7cce1ceeac9eeac839d41db40ba983f97d':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 12 Oct 2015 13:00:56 +0000 (13:00 +0000)]
am
5fa0a93d: (-s ours) am
4fedc0fd: (-s ours) Import translations. DO NOT MERGE
* commit '
5fa0a93d3ed1ad838fd43a41f4df9703ae206345':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 12 Oct 2015 12:55:33 +0000 (12:55 +0000)]
am
4fedc0fd: (-s ours) Import translations. DO NOT MERGE
* commit '
4fedc0fdaf6a372c5607c4b8c6667cf4b85d7202':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 12 Oct 2015 12:52:36 +0000 (12:52 +0000)]
am
30d1619a: (-s ours) am
c483a5e3: (-s ours) am
5a761be3: (-s ours) am
7d521a8f: (-s ours) am
f598d0bc: (-s ours) Import translations. DO NOT MERGE
* commit '
30d1619a4472537317eb99a46c6ef3eb08e6c225':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 12 Oct 2015 12:47:52 +0000 (12:47 +0000)]
am
c483a5e3: (-s ours) am
5a761be3: (-s ours) am
7d521a8f: (-s ours) am
f598d0bc: (-s ours) Import translations. DO NOT MERGE
* commit '
c483a5e3fc3377c5ea3535e908c60ba1ac901936':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 12 Oct 2015 12:43:04 +0000 (12:43 +0000)]
am
5a761be3: (-s ours) am
7d521a8f: (-s ours) am
f598d0bc: (-s ours) Import translations. DO NOT MERGE
* commit '
5a761be3dd72b5a318f9387d104f7010b327bfec':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 12 Oct 2015 12:37:43 +0000 (12:37 +0000)]
am
7d521a8f: (-s ours) am
f598d0bc: (-s ours) Import translations. DO NOT MERGE
* commit '
7d521a8ff28ac8bc6110bc6eaff38c58bb792ca0':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 12 Oct 2015 12:34:25 +0000 (05:34 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia5044b8f155b8256dedc8581f8c7147ffdd0d2bc
Auto-generated-cl: translation import
Geoff Mendal [Mon, 12 Oct 2015 12:30:37 +0000 (12:30 +0000)]
am
f598d0bc: (-s ours) Import translations. DO NOT MERGE
* commit '
f598d0bcf70e27a14462bc5403c83822c5600945':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 12 Oct 2015 12:21:40 +0000 (05:21 -0700)]
Import translations. DO NOT MERGE
Change-Id: I0eb630b2b5dec19d48787ff56367a3f05b41483a
Auto-generated-cl: translation import
Christopher Tate [Sat, 10 Oct 2015 00:14:12 +0000 (00:14 +0000)]
am
eba9ff7c: am
78f7fa0f: am
90de3beb: Disable app-link preferences for browser apps
* commit '
eba9ff7c64767ba903a424adf6c74844317908cb':
Disable app-link preferences for browser apps
Christopher Tate [Sat, 10 Oct 2015 00:09:02 +0000 (00:09 +0000)]
am
78f7fa0f: am
90de3beb: Disable app-link preferences for browser apps
* commit '
78f7fa0fc8ed3ede373cdb42e2af2046c87ac470':
Disable app-link preferences for browser apps
Christopher Tate [Fri, 9 Oct 2015 23:57:48 +0000 (23:57 +0000)]
am
90de3beb: Disable app-link preferences for browser apps
* commit '
90de3bebf432d0897607adaca281fe248cd6575f':
Disable app-link preferences for browser apps
Christopher Tate [Tue, 8 Sep 2015 22:41:08 +0000 (15:41 -0700)]
Disable app-link preferences for browser apps
Also make sure that the 'Clear defaults' action unsets the app's
standing as the default browser, when applicable.
Bug
23751034
Change-Id: I6131b763bfa76ba38d18cad2abbb35caffe789aa
Amit Mahajan [Mon, 5 Oct 2015 18:06:54 +0000 (11:06 -0700)]
Change to add user_visible field to Carriers table.
Also adding config to control if adding APNs is allowed.
Bug:
24519879
Bug:
24681288
Change-Id: I59466f5489606162a10e883ede378e575a189fb3
Geoff Mendal [Wed, 7 Oct 2015 15:59:51 +0000 (15:59 +0000)]
am
55d7bf4f: (-s ours) am
32f4b469: (-s ours) am
47e870ad: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
55d7bf4f5cb26c4f26c3ac6cbad0b8ca3c0ad579':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 7 Oct 2015 15:55:23 +0000 (15:55 +0000)]
am
32f4b469: (-s ours) am
47e870ad: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
32f4b4690ee39986595ad0803070f112e06203ef':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 7 Oct 2015 15:50:10 +0000 (15:50 +0000)]
am
47e870ad: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
47e870adc8df32c2a6e2c531be115dd0b698850e':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 7 Oct 2015 15:45:36 +0000 (15:45 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Geoff Mendal [Wed, 7 Oct 2015 14:44:44 +0000 (07:44 -0700)]
Import translations. DO NOT MERGE
Change-Id: I3b42883202e9bc41fcd5b4bcc844db53e7ee6efd
Auto-generated-cl: translation import
Geoff Mendal [Wed, 7 Oct 2015 13:22:36 +0000 (13:22 +0000)]
am
b224ec18: (-s ours) am
fd9b7cf0: (-s ours) am
e3d8faa5: (-s ours) am
4f7f05a0: (-s ours) am
ad36aa0e: (-s ours) am
3963b980: (-s ours) am
793b2a2d: (-s ours) am
d4fd061d: (-s ours) Import translations. DO NOT MERGE
* commit '
b224ec187db4f065bc8f4015eadfef10deba0e73':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 7 Oct 2015 13:18:40 +0000 (13:18 +0000)]
am
fd9b7cf0: (-s ours) am
e3d8faa5: (-s ours) am
4f7f05a0: (-s ours) am
ad36aa0e: (-s ours) am
3963b980: (-s ours) am
793b2a2d: (-s ours) am
d4fd061d: (-s ours) Import translations. DO NOT MERGE
* commit '
fd9b7cf03c4454df8ddf166eb37fa5370d28125b':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 7 Oct 2015 13:13:34 +0000 (13:13 +0000)]
am
e3d8faa5: (-s ours) am
4f7f05a0: (-s ours) am
ad36aa0e: (-s ours) am
3963b980: (-s ours) am
793b2a2d: (-s ours) am
d4fd061d: (-s ours) Import translations. DO NOT MERGE
* commit '
e3d8faa5ba76f79b112dd8925189455e878e3a66':
Import translations. DO NOT MERGE
OSDN Git Service
