OSDN Git Service
Geoff Mendal [Mon, 19 Oct 2015 13:40:02 +0000 (13:40 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 19 Oct 2015 13:39:34 +0000 (06:39 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5165b5d0fe4fc0cf9dff9ccf44fe1aa95db26628
Auto-generated-cl: translation import
Geoff Mendal [Mon, 19 Oct 2015 13:21:41 +0000 (13:21 +0000)]
am
1c95645b: (-s ours) 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 '
1c95645b3bbc55db50d5720e29a2b867d849d0f8':
Import translations. DO NOT MERGE
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
Julia Reynolds [Fri, 16 Oct 2015 19:29:39 +0000 (19:29 +0000)]
Merge "Update sorting for rule types and instances."
Maurice Lam [Fri, 16 Oct 2015 17:44:04 +0000 (17:44 +0000)]
Merge "Fix preferences v14 issues in lock screeen setup"
Jason Monk [Fri, 16 Oct 2015 16:56:40 +0000 (16:56 +0000)]
am
6d85d168: am
d2975f9d: am
d9774c9f: am
cdcba9ce: Merge "Fix crashes in Settings" into mnc-dr-dev
* commit '
6d85d1686e6a333fe990d9e3ae5b978e8a8ce8c2':
Fix crashes in Settings
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:33:53 +0000 (16:33 +0000)]
am
bfee8b48: am
31e2ce0e: am
d36edb9f: am
de005547: Merge "Bail if activity was destroyed." into mnc-dr-dev
* commit '
bfee8b484f3bb4807d185526058ea463f91f1091':
Bail if activity was destroyed.
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
Julia Reynolds [Wed, 14 Oct 2015 21:19:35 +0000 (17:19 -0400)]
Update sorting for rule types and instances.
Bug:
22977552
Change-Id: I671f45f156f8f3faa4ce55608dd1d61b9f07d16a
Jason Monk [Fri, 16 Oct 2015 14:59:02 +0000 (10:59 -0400)]
Fix add account screen
Don't use layout that didn't do anything special.
Bug:
24961118
Change-Id: I9207ee16e8c2c8325f3b4c00e423ac015170d10e
Jason Monk [Fri, 16 Oct 2015 14:50:25 +0000 (10:50 -0400)]
Fix ManagedServiceSettings to work with Preferencev14
Bug:
25007000
Change-Id: I5e3a59b77001ce0e2928b35fa1b87878e22d4fbd
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
Maurice Lam [Thu, 15 Oct 2015 21:06:24 +0000 (14:06 -0700)]
Fix preferences v14 issues in lock screeen setup
Preferences support-v14 expects a RecyclerView, and cannot override
onCreateView to inflate custom views. This changes
SetupChooseLockGeneric to use suw_template_no_scroll and let
preference framework inflate its RecyclerView inside it.
Bug:
24929660
Change-Id: Icda0fed37b68d4cffb49da46a241185f32d7e467
Jason Monk [Thu, 15 Oct 2015 19:37:59 +0000 (15:37 -0400)]
Fix SUW Settings themes
Bug:
24929660
Change-Id: I21979a115e968a9e3a7ecd42f8258d0ce470cd6e
Amit Mahajan [Wed, 14 Oct 2015 23:54:00 +0000 (23:54 +0000)]
am
7b990298: am
f20d51f3: am
6d042a69: am
1704ca96: Merge "Change to add user_visible field to Carriers table." into mnc-dr-dev
* commit '
7b990298323f0e24c87123d955cfd08717a079d3':
Change to add user_visible field to Carriers table.
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 18:01:50 +0000 (18:01 +0000)]
am
38fc400a: am
453d52b6: am
51d71aa2: am
583deb52: Merge "Unconfigure the lockdown VPN if the user forgets its profile." into mnc-dr-dev
* commit '
38fc400ac901c8cfec0aeaf07c9d11a2f29d3ce2':
Unconfigure the lockdown VPN if the user forgets its profile.
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:53:03 +0000 (14:53 +0000)]
am
63bb6cb9: (-s ours) am
fbcbe2a9: (-s ours) am
edbd1cd2: (-s ours) am
74d90b3e: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
63bb6cb9cd7e067e737a82190e4db537cb75e3ef':
Import translations. DO NOT MERGE
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:56:08 +0000 (13:56 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Wed, 14 Oct 2015 13:43:11 +0000 (06:43 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iecb38744cc520c2abbad60c1b6f0efc4b276b98d
Auto-generated-cl: translation import
Geoff Mendal [Wed, 14 Oct 2015 13:18:03 +0000 (13:18 +0000)]
am
338b91f5: (-s ours) 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 '
338b91f53007c908b5b3b44d2c9aa0c9b4e98fe7':
Import translations. DO NOT MERGE
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
Jason Monk [Wed, 14 Oct 2015 12:51:57 +0000 (12:51 +0000)]
Merge "Fix crash language & input settings"
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:46:52 +0000 (12:46 +0000)]
am
a1641e81: (-s ours) 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 '
a1641e814370f0f2bdfb241de249f9a8e10200a9':
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
Jason Monk [Tue, 13 Oct 2015 20:45:28 +0000 (16:45 -0400)]
Fix crash language & input settings
Bug:
24576551
Change-Id: Ifb717689c862193cf06c23de52b3fb68f910db3c
Jason Monk [Thu, 10 Sep 2015 19:52:51 +0000 (15:52 -0400)]
Depend on support lib preferences
Bug:
24576551
Change-Id: Ic6190bacd3f7582c9bbc8de972da4612bd92421e
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 03:59:58 +0000 (03:59 +0000)]
am
878faf03: (-s ours) am
56b7a690: (-s ours) am
14bd3435: (-s ours) am
c16b10ea: (-s ours) Import translations. DO NOT MERGE
* commit '
878faf03bc2ff22faf201c2e14b97ac47f95f977':
Import translations. DO NOT MERGE
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
Toni Barzic [Mon, 12 Oct 2015 17:38:05 +0000 (17:38 +0000)]
Merge "Fix plurals messages for autoclick delay strings"
Geoff Mendal [Mon, 12 Oct 2015 17:13:48 +0000 (17:13 +0000)]
am
8788bd83: (-s ours) am
93c6f4fc: (-s ours) am
20625ebc: (-s ours) am
49848a63: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
8788bd837b608933ad909274ed4ed5adadaf4009':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 12 Oct 2015 17:13:23 +0000 (17:13 +0000)]
am
956d9545: (-s ours) 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 '
956d9545af6d6af42907f08fdd57c39d6f7be981':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 12 Oct 2015 17:13:20 +0000 (17:13 +0000)]
am
61a49083: (-s ours) 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 '
61a490837cd54c6e31de74b35762f7cbb0a85d80':
Import translations. DO NOT MERGE
Tony Mantler [Mon, 12 Oct 2015 15:56:52 +0000 (15:56 +0000)]
Merge "Move DreamBackend to SettingsLib"
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:51:40 +0000 (06:51 -0700)]
Import translations. DO NOT MERGE
Change-Id: I825c42e25f353952adc02f2c99beb1ad2768c4d5
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:49:13 +0000 (17:49 -0700)]
resolved conflicts for
192248cc to master
Change-Id: I636e9c78445c3bbd8b290ec0601a45d68b36a06d
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
OSDN Git Service
