OSDN Git Service
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
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: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: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: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 [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: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: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: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: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: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: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
Geoff Mendal [Wed, 7 Oct 2015 13:07:48 +0000 (13:07 +0000)]
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 '
4f7f05a00bf1b909140119884b65373b6248c0db':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 7 Oct 2015 13:01:25 +0000 (13:01 +0000)]
am
ad36aa0e: (-s ours) am
3963b980: (-s ours) am
793b2a2d: (-s ours) am
d4fd061d: (-s ours) Import translations. DO NOT MERGE
* commit '
ad36aa0ed1b7ba2541d28bc447473e27f3d04e22':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 7 Oct 2015 12:56:58 +0000 (12:56 +0000)]
am
5e183ac6: (-s ours) am
bd64cd59: (-s ours) am
35d2cf1c: (-s ours) am
b4a027d0: (-s ours) Import translations. DO NOT MERGE
* commit '
5e183ac6608eb5aca32a2a2835cd321217b451fb':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 7 Oct 2015 12:56:45 +0000 (12:56 +0000)]
am
3963b980: (-s ours) am
793b2a2d: (-s ours) am
d4fd061d: (-s ours) Import translations. DO NOT MERGE
* commit '
3963b980bebacb58dd2ed57fd45b042a01f125a0':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 7 Oct 2015 12:51:52 +0000 (12:51 +0000)]
am
bd64cd59: (-s ours) am
35d2cf1c: (-s ours) am
b4a027d0: (-s ours) Import translations. DO NOT MERGE
* commit '
bd64cd59d6aace965dec9896a545572e16b456d6':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 7 Oct 2015 12:51:18 +0000 (12:51 +0000)]
am
793b2a2d: (-s ours) am
d4fd061d: (-s ours) Import translations. DO NOT MERGE
* commit '
793b2a2d444192ee587a643c88e535ebf0c98158':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 7 Oct 2015 12:46:38 +0000 (12:46 +0000)]
am
d4fd061d: (-s ours) Import translations. DO NOT MERGE
* commit '
d4fd061d6e33abb96dd8a6cac2d14cdbca154ce9':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 7 Oct 2015 12:46:25 +0000 (12:46 +0000)]
am
35d2cf1c: (-s ours) am
b4a027d0: (-s ours) Import translations. DO NOT MERGE
* commit '
35d2cf1c0c75342b307fa90f1508741b10169c9f':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 7 Oct 2015 12:41:35 +0000 (12:41 +0000)]
am
b4a027d0: (-s ours) Import translations. DO NOT MERGE
* commit '
b4a027d07bdd6b488a0ca576f7369beb0cad17c6':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 7 Oct 2015 12:36:18 +0000 (05:36 -0700)]
Import translations. DO NOT MERGE
Change-Id: I93b053134a71c4db60e58d3bf8fd9c43cd90cc9b
Auto-generated-cl: translation import
Geoff Mendal [Wed, 7 Oct 2015 12:23:13 +0000 (05:23 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ifeb18585f7add2909ad50d12839ba920a76cf44c
Auto-generated-cl: translation import
Geoff Mendal [Mon, 5 Oct 2015 15:41:17 +0000 (15:41 +0000)]
am
7a3682ad: (-s ours) am
32037913: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
7a3682ad1642ccd7a4fed32c633d8abeef9b8db3':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 5 Oct 2015 15:35:38 +0000 (15:35 +0000)]
am
32037913: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
3203791351e56e5ad0ead42c967fac0e154cbf7c':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 5 Oct 2015 15:30:33 +0000 (15:30 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Geoff Mendal [Mon, 5 Oct 2015 14:42:17 +0000 (07:42 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iaf5ad5766d6f6fbd163d612ad1314f62cf07cc1d
Auto-generated-cl: translation import
Geoff Mendal [Mon, 5 Oct 2015 13:13:40 +0000 (13:13 +0000)]
am
223b9739: (-s ours) am
37166a4c: (-s ours) am
a4cd63f6: (-s ours) am
03226257: (-s ours) am
45335b0c: (-s ours) am
0070fbfe: (-s ours) am
f0338376: (-s ours) Import translations. DO NOT MERGE
* commit '
223b9739a9debdbdfd2a4d3b42c66c36d04d21cd':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 5 Oct 2015 13:06:50 +0000 (13:06 +0000)]
am
37166a4c: (-s ours) am
a4cd63f6: (-s ours) am
03226257: (-s ours) am
45335b0c: (-s ours) am
0070fbfe: (-s ours) am
f0338376: (-s ours) Import translations. DO NOT MERGE
* commit '
37166a4cf69254d5993d25c4e2a446bb5555411e':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 5 Oct 2015 13:01:52 +0000 (13:01 +0000)]
am
a4cd63f6: (-s ours) am
03226257: (-s ours) am
45335b0c: (-s ours) am
0070fbfe: (-s ours) am
f0338376: (-s ours) Import translations. DO NOT MERGE
* commit '
a4cd63f6cc3a835ab268a9854f5ea8d7f41342c0':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 5 Oct 2015 12:55:55 +0000 (12:55 +0000)]
am
03226257: (-s ours) am
45335b0c: (-s ours) am
0070fbfe: (-s ours) am
f0338376: (-s ours) Import translations. DO NOT MERGE
* commit '
032262578565c928b47996d096f3518cf1f09aa7':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 5 Oct 2015 12:52:33 +0000 (12:52 +0000)]
am
45335b0c: (-s ours) am
0070fbfe: (-s ours) am
f0338376: (-s ours) Import translations. DO NOT MERGE
* commit '
45335b0c5eeaeb068af6c35bcaa25b08cf10db9d':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 5 Oct 2015 12:48:14 +0000 (12:48 +0000)]
am
bcc5b07e: (-s ours) am
7521c1a0: (-s ours) am
82c61b2d: (-s ours) am
010d2fcd: (-s ours) Import translations. DO NOT MERGE
* commit '
bcc5b07e99d6947ee4d0c9430899ce5485bcbaea':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 5 Oct 2015 12:45:22 +0000 (12:45 +0000)]
am
0070fbfe: (-s ours) am
f0338376: (-s ours) Import translations. DO NOT MERGE
* commit '
0070fbfe01eab83402949298188322f1168b5b3c':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 5 Oct 2015 12:42:21 +0000 (12:42 +0000)]
am
7521c1a0: (-s ours) am
82c61b2d: (-s ours) am
010d2fcd: (-s ours) Import translations. DO NOT MERGE
* commit '
7521c1a03e929ab7d26d4492a434a4b33bfe52c3':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 5 Oct 2015 12:41:50 +0000 (12:41 +0000)]
am
f0338376: (-s ours) Import translations. DO NOT MERGE
* commit '
f0338376779311f2ee0c709e9735dfe5e89cde56':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 5 Oct 2015 12:34:59 +0000 (12:34 +0000)]
am
82c61b2d: (-s ours) am
010d2fcd: (-s ours) Import translations. DO NOT MERGE
* commit '
82c61b2dd878eae9a30bd7953bf3e2390e1e5611':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 5 Oct 2015 12:33:27 +0000 (05:33 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2aa93f9635911e98133a6ab0cbba1740c62551cf
Auto-generated-cl: translation import
Geoff Mendal [Mon, 5 Oct 2015 12:32:07 +0000 (12:32 +0000)]
am
010d2fcd: (-s ours) Import translations. DO NOT MERGE
* commit '
010d2fcd2a4b8fda906ff0a0e04554475a45489c':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 5 Oct 2015 12:20:30 +0000 (05:20 -0700)]
Import translations. DO NOT MERGE
Change-Id: I56f2a38c8fee8b9cc019538933dfeead37a14d75
Auto-generated-cl: translation import
Zach Kuznia [Thu, 1 Oct 2015 00:23:58 +0000 (00:23 +0000)]
am
a8f3f067: am
ae8aea76: Merge "Allow manual to be read from disk" into mnc-dr-dev
* commit '
a8f3f067b672a8e055e76beee300cc2b1a8bea31':
Allow manual to be read from disk
Zach Kuznia [Thu, 1 Oct 2015 00:15:52 +0000 (00:15 +0000)]
am
ae8aea76: Merge "Allow manual to be read from disk" into mnc-dr-dev
* commit '
ae8aea76e5cbef1eefde401f8622d05275156cf7':
Allow manual to be read from disk
Zach Kuznia [Thu, 1 Oct 2015 00:08:05 +0000 (00:08 +0000)]
Merge "Allow manual to be read from disk" into mnc-dr-dev
Geoff Mendal [Wed, 30 Sep 2015 20:21:19 +0000 (20:21 +0000)]
am
21416b83: (-s ours) am
1207a501: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
21416b8318ae2dd63296a255ae8bc0f0bdda1fa4':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 30 Sep 2015 20:11:24 +0000 (20:11 +0000)]
am
1207a501: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
1207a50100bbb3aaa55fc6394e13ad18fc019f8e':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 30 Sep 2015 16:48:17 +0000 (16:48 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Geoff Mendal [Wed, 30 Sep 2015 14:42:27 +0000 (07:42 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iefde97a2fb8e5db601673631195ddcb638e2a81f
Auto-generated-cl: translation import
Geoff Mendal [Wed, 30 Sep 2015 13:11:18 +0000 (13:11 +0000)]
am
82c45e07: (-s ours) am
4446480e: (-s ours) am
0929be66: (-s ours) am
dffcc532: (-s ours) am
c7b0a816: (-s ours) am
49b491bb: (-s ours) am
2e095fa2: (-s ours) Import translations. DO NOT MERGE
* commit '
82c45e07c2c6771142ad7b7dffaae23f9151d597':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 30 Sep 2015 13:08:11 +0000 (13:08 +0000)]
am
4446480e: (-s ours) am
0929be66: (-s ours) am
dffcc532: (-s ours) am
c7b0a816: (-s ours) am
49b491bb: (-s ours) am
2e095fa2: (-s ours) Import translations. DO NOT MERGE
* commit '
4446480e7f468afbc55fc3c18abb05ca77eb03be':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 30 Sep 2015 13:02:08 +0000 (13:02 +0000)]
am
0929be66: (-s ours) am
dffcc532: (-s ours) am
c7b0a816: (-s ours) am
49b491bb: (-s ours) am
2e095fa2: (-s ours) Import translations. DO NOT MERGE
* commit '
0929be6613afbf01c313e94f019a0a3d30c9a0a4':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 30 Sep 2015 12:57:33 +0000 (12:57 +0000)]
am
dffcc532: (-s ours) am
c7b0a816: (-s ours) am
49b491bb: (-s ours) am
2e095fa2: (-s ours) Import translations. DO NOT MERGE
* commit '
dffcc532693c4bc6e07cf05ac532148612a94176':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 30 Sep 2015 12:51:15 +0000 (12:51 +0000)]
am
c7b0a816: (-s ours) am
49b491bb: (-s ours) am
2e095fa2: (-s ours) Import translations. DO NOT MERGE
* commit '
c7b0a8162520ffedcfcddb86d1f0e394513b7cf1':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 30 Sep 2015 12:47:04 +0000 (12:47 +0000)]
am
49b491bb: (-s ours) am
2e095fa2: (-s ours) Import translations. DO NOT MERGE
* commit '
49b491bb7634284a8622e48c88571aa59ba59ac7':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 30 Sep 2015 12:46:38 +0000 (12:46 +0000)]
am
a462b286: (-s ours) am
99842468: (-s ours) am
afc38312: (-s ours) am
77fc6ac5: (-s ours) Import translations. DO NOT MERGE
* commit '
a462b2862a8694ba76ea7ee9047eab5ce7a2f769':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 30 Sep 2015 12:41:16 +0000 (12:41 +0000)]
am
2e095fa2: (-s ours) Import translations. DO NOT MERGE
* commit '
2e095fa263b0887fc55576b32625264e13fee4c7':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 30 Sep 2015 12:38:10 +0000 (12:38 +0000)]
am
99842468: (-s ours) am
afc38312: (-s ours) am
77fc6ac5: (-s ours) Import translations. DO NOT MERGE
* commit '
99842468d307709cc90414339aa7ddab2f08c855':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 30 Sep 2015 12:34:33 +0000 (05:34 -0700)]
Import translations. DO NOT MERGE
Change-Id: I80d2cc4534deffcec5bd3f7566e19a2107ead775
Auto-generated-cl: translation import
Geoff Mendal [Wed, 30 Sep 2015 12:33:46 +0000 (12:33 +0000)]
am
afc38312: (-s ours) am
77fc6ac5: (-s ours) Import translations. DO NOT MERGE
* commit '
afc3831267c426974119608bb6c9179223532e47':
Import translations. DO NOT MERGE
OSDN Git Service
