Commit Graph

258311 Commits

Author SHA1 Message Date
Bill Yi
52ebdfd973 Import translations. DO NOT MERGE
Change-Id: I741e6b188e72f4805e0eb34d27b93cdf89cfcad0
Auto-generated-cl: translation import
2018-03-02 16:43:41 -08:00
TreeHugger Robot
87b0f9add8 Merge "Import translations. DO NOT MERGE" into cw-f-dev 2018-02-20 04:54:20 +00:00
TreeHugger Robot
8e7e1e874f Merge "Import translations. DO NOT MERGE" into cw-f-dev 2018-02-20 04:53:51 +00:00
Bill Yi
fb5d1738dd Import translations. DO NOT MERGE
Change-Id: I2e31731c8393cbcd58b57cc4092d14626e60af8b
Auto-generated-cl: translation import
2018-02-19 09:16:47 -08:00
Bill Yi
a4513689c8 Import translations. DO NOT MERGE
Change-Id: I1b9d68a390483f6259a7eb05a2e337af617896b6
Auto-generated-cl: translation import
2018-02-19 08:07:44 -08:00
Bill Yi
4c87ffeae2 Import translations. DO NOT MERGE
Change-Id: I6076b206d8c838472c2c958d521ece8038e10206
Auto-generated-cl: translation import
2018-02-19 07:08:29 -08:00
Android Build Merger (Role)
7db4a90e60 [automerger] DO NOT MERGE Fix mTrustManager NPE am: a381c4ced3 am: 30a705874a am: 85727109f0 skipped: 15a3e59d35 am: 0a2ed3f761 am: d57766c5b4 am: fc98290b1f
Change-Id: I27c9d607c6b3b7ae5126a9bb22cdb4ea18963918
2018-02-15 00:06:11 +00:00
Android Build Merger (Role)
fc98290b1f [automerger] DO NOT MERGE Fix mTrustManager NPE am: a381c4ced3 am: 30a705874a am: 85727109f0 skipped: 15a3e59d35 am: 0a2ed3f761 am: d57766c5b4
Change-Id: Iac5a694469e6c111f204df6c58446a45cf0ada7c
2018-02-15 00:06:07 +00:00
Android Build Merger (Role)
d57766c5b4 [automerger] DO NOT MERGE Fix mTrustManager NPE am: a381c4ced3 am: 30a705874a am: 85727109f0 skipped: 15a3e59d35 am: 0a2ed3f761
Change-Id: Ie5d077cba11b7b9277f4fbce046e571a01535c3c
2018-02-15 00:06:02 +00:00
Android Build Merger (Role)
0a2ed3f761 [automerger] DO NOT MERGE Fix mTrustManager NPE am: a381c4ced3 am: 30a705874a am: 85727109f0 skipped: 15a3e59d35
Change-Id: If169e52215ed3a3428d4ff4e834f635f7b0f30e1
2018-02-15 00:05:54 +00:00
Android Build Merger (Role)
15a3e59d35 [automerger] DO NOT MERGE Fix mTrustManager NPE am: a381c4ced3 am: 30a705874a am: 85727109f0
Change-Id: I80463ee5315c2672e812659192b227c8271e9113
2018-02-15 00:05:49 +00:00
Android Build Merger (Role)
85727109f0 [automerger] DO NOT MERGE Fix mTrustManager NPE am: a381c4ced3 am: 30a705874a
Change-Id: Ic83a666bae330bea031b95233079e1493c02c9b3
2018-02-15 00:05:43 +00:00
Android Build Merger (Role)
30a705874a [automerger] DO NOT MERGE Fix mTrustManager NPE am: a381c4ced3
Change-Id: Ib622af453781a1769e820c10d6ab46c140809c57
2018-02-15 00:05:38 +00:00
Android Build Merger (Role)
9e5c21243c Merge "Merge changes from topic "am-ef8b8c56c2ad450fb6fab355f35597b0" into nyc-mr1-dev am: 50d4e94767" into cw-f-dev 2018-02-08 00:27:17 +00:00
Etan Cohen
1aab54a3a3 Merge changes from topic "am-ef8b8c56c2ad450fb6fab355f35597b0" into nyc-mr1-dev
am: 50d4e94767

Change-Id: I05fe6580c2bf6a44f5fadda55fa5b2d944d9be9e
2018-02-08 00:26:07 +00:00
Android Build Merger (Role)
0c8b40873e [automerger] Merge changes from topic "am-513301705eec406eb3be13d14037bb53" into nyc-dev am: fa72a625cc am: cdc187ee10 am: 363b273e9a
Change-Id: Idafe9ec60693bf6ffaa3aa7833869261a416d4c1
2018-02-08 00:16:33 +00:00
Android Build Merger (Role)
363b273e9a [automerger] Merge changes from topic "am-513301705eec406eb3be13d14037bb53" into nyc-dev am: fa72a625cc am: cdc187ee10
Change-Id: I75f04f568669d0a09e7b492cc2cbcad8bd80389b
2018-02-08 00:16:09 +00:00
Etan Cohen
cdc187ee10 Merge changes from topic "am-513301705eec406eb3be13d14037bb53" into nyc-dev
am: fa72a625cc

Change-Id: I99bcbd911edac1d5089e510b888c665f02dc881c
2018-02-08 00:15:28 +00:00
Etan Cohen
1d10387f0d Merge changes from topic "am-513301705eec406eb3be13d14037bb53" into nyc-mr1-dev
am: bd629f69ed

Change-Id: I23b5db36cb5d4d72a23894e75e36ad483ad23338
2018-02-08 00:07:01 +00:00
Android Build Merger (Role)
c8c1b5162f Merge "Merge "Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into nyc-dr1-dev am: c157934e61" into nyc-mr1-dev am: f4ea18a058" into cw-f-dev 2018-02-07 23:50:21 +00:00
Android Build Merger (Role)
358bf6c4f9 Merge "Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into nyc-dr1-dev am: 4feca3b99f" into nyc-mr1-dev 2018-02-07 23:49:05 +00:00
Android Build Merger (Role)
124da97327 Merge changes from topic "am-02bffa5d2f4a4860b898fa67a751a8f5" into cw-f-dev
* changes:
  [automerger] Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into nyc-dr1-dev am: 4feca3b99f am: b164f1dce0
  Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into nyc-dr1-dev am: 4feca3b99f
2018-02-07 23:49:05 +00:00
Etan Cohen
3ba85c8957 Merge "Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into nyc-dr1-dev am: c157934e61" into nyc-mr1-dev
am: f4ea18a058

Change-Id: I98fb6d1b1d7020d7ed057454754d1f1f6000fec6
2018-02-07 23:47:23 +00:00
Android Build Merger (Role)
50d4e94767 Merge changes from topic "am-ef8b8c56c2ad450fb6fab355f35597b0" into nyc-mr1-dev
* changes:
  [automerger] Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into nyc-dev am: 47f4b8411f am: e1ea5d3df1
  Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into nyc-dev am: 47f4b8411f
2018-02-07 23:46:50 +00:00
Android Build Merger (Role)
3d138f1113 Merge "Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into nyc-dev am: 47f4b8411f" into nyc-dr1-dev 2018-02-07 23:46:50 +00:00
Android Build Merger (Role)
e79c03a732 Merge changes from topic "am-ef8b8c56c2ad450fb6fab355f35597b0" into cw-f-dev
* changes:
  [automerger] Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into nyc-dev am: 47f4b8411f am: e1ea5d3df1 am: 6f10ae56a2
  [automerger] Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into nyc-dev am: 47f4b8411f am: e1ea5d3df1
  Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into nyc-dev am: 47f4b8411f
2018-02-07 23:46:50 +00:00
Android Build Merger (Role)
651db1820d [automerger] Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into nyc-dr1-dev am: 4feca3b99f am: b164f1dce0
Change-Id: Iee5a04cf07d706faad6ea0a987d48feb10c504f1
2018-02-07 23:46:33 +00:00
Etan Cohen
b164f1dce0 Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into nyc-dr1-dev
am: 4feca3b99f

Change-Id: Id02665871c6b93b03fa1294278e3cb8513811b5e
2018-02-07 23:45:55 +00:00
Android Build Merger (Role)
5e30c39b3d [automerger] Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into nyc-dev am: 47f4b8411f am: e1ea5d3df1 am: 6f10ae56a2
Change-Id: I719bed29c66b873461642fbd3815a993d59720f2
2018-02-07 23:45:24 +00:00
Android Build Merger (Role)
fa72a625cc Merge changes from topic "am-513301705eec406eb3be13d14037bb53" into nyc-dev
* changes:
  [automerger] Merge "Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into mnc-dr-dev am: 0153ac9dad" into cw-e-dev am: 84118c127f am: c975948988
  Merge "Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into mnc-dr-dev am: 0153ac9dad" into cw-e-dev am: 84118c127f
2018-02-07 23:45:18 +00:00
Android Build Merger (Role)
bd629f69ed Merge changes from topic "am-513301705eec406eb3be13d14037bb53" into nyc-mr1-dev
* changes:
  [automerger] Merge "Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into mnc-dr-dev am: 0153ac9dad" into cw-e-dev am: 84118c127f am: c975948988 am: b8abffa008 am: 74c421f08a
  [automerger] Merge "Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into mnc-dr-dev am: 0153ac9dad" into cw-e-dev am: 84118c127f am: c975948988 am: b8abffa008
  [automerger] Merge "Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into mnc-dr-dev am: 0153ac9dad" into cw-e-dev am: 84118c127f am: c975948988
  Merge "Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into mnc-dr-dev am: 0153ac9dad" into cw-e-dev am: 84118c127f
2018-02-07 23:45:18 +00:00
Android Build Merger (Role)
cfd2aec35d Merge changes from topic "am-513301705eec406eb3be13d14037bb53" into nyc-dr1-dev
* changes:
  [automerger] Merge "Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into mnc-dr-dev am: 0153ac9dad" into cw-e-dev am: 84118c127f am: c975948988 am: b8abffa008
  [automerger] Merge "Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into mnc-dr-dev am: 0153ac9dad" into cw-e-dev am: 84118c127f am: c975948988
  Merge "Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into mnc-dr-dev am: 0153ac9dad" into cw-e-dev am: 84118c127f
2018-02-07 23:45:18 +00:00
Android Build Merger (Role)
cdd69c51d2 Merge changes from topic "am-513301705eec406eb3be13d14037bb53" into cw-f-dev
* changes:
  [automerger] Merge "Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into mnc-dr-dev am: 0153ac9dad" into cw-e-dev am: 84118c127f am: c975948988 am: b8abffa008 am: 74c421f08a am: 1746fb72aa
  [automerger] Merge "Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into mnc-dr-dev am: 0153ac9dad" into cw-e-dev am: 84118c127f am: c975948988 am: b8abffa008 am: 74c421f08a
  [automerger] Merge "Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into mnc-dr-dev am: 0153ac9dad" into cw-e-dev am: 84118c127f am: c975948988 am: b8abffa008
  [automerger] Merge "Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into mnc-dr-dev am: 0153ac9dad" into cw-e-dev am: 84118c127f am: c975948988
  Merge "Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into mnc-dr-dev am: 0153ac9dad" into cw-e-dev am: 84118c127f
2018-02-07 23:45:18 +00:00
Android Build Merger (Role)
6f10ae56a2 [automerger] Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into nyc-dev am: 47f4b8411f am: e1ea5d3df1
Change-Id: Ie3405b9e4ff95c8974e9a7f08ca949112b161002
2018-02-07 23:45:07 +00:00
Etan Cohen
e1ea5d3df1 Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into nyc-dev
am: 47f4b8411f

Change-Id: Idb749103a54c357be2b17081c52265ca54426677
2018-02-07 23:44:04 +00:00
Android Build Merger (Role)
247b4d5372 [automerger] Merge "Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into mnc-dr-dev am: 0153ac9dad" into cw-e-dev am: 84118c127f am: c975948988 am: b8abffa008 am: 74c421f08a am: 1746fb72aa
Change-Id: I6f4b93c8eefa4d406eca1467f6e6883028aa6c99
2018-02-07 23:41:52 +00:00
Android Build Merger (Role)
c290ad3333 [automerger] Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into mnc-dr1.5-dev am: eac0551992 am: 196b64c28c am: af8b7b859a am: 25b8c8b3fb
Change-Id: Ia902911c856ee0c6c5b6fa51527071f3b469775f
2018-02-07 23:41:42 +00:00
Android Build Merger (Role)
1746fb72aa [automerger] Merge "Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into mnc-dr-dev am: 0153ac9dad" into cw-e-dev am: 84118c127f am: c975948988 am: b8abffa008 am: 74c421f08a
Change-Id: I5b9852908336603c83c9318229a3d8fe891f7a9b
2018-02-07 23:41:31 +00:00
Android Build Merger (Role)
25b8c8b3fb [automerger] Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into mnc-dr1.5-dev am: eac0551992 am: 196b64c28c am: af8b7b859a
Change-Id: I01648d7eb843c440c7b72ec26e35a9aee60eeff0
2018-02-07 23:41:13 +00:00
Android Build Merger (Role)
74c421f08a [automerger] Merge "Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into mnc-dr-dev am: 0153ac9dad" into cw-e-dev am: 84118c127f am: c975948988 am: b8abffa008
Change-Id: I7e4aa757fe6447cc2bca1134e4406123e1ec3546
2018-02-07 23:40:59 +00:00
Android Build Merger (Role)
af8b7b859a [automerger] Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into mnc-dr1.5-dev am: eac0551992 am: 196b64c28c
Change-Id: I88db62bf864dfd51d8efe1e445fe953c17d684d9
2018-02-07 23:40:06 +00:00
Android Build Merger (Role)
b8abffa008 [automerger] Merge "Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into mnc-dr-dev am: 0153ac9dad" into cw-e-dev am: 84118c127f am: c975948988
Change-Id: I2e6188de2f8814f2f75efe5000013c5636bc154a
2018-02-07 23:39:56 +00:00
Etan Cohen
196b64c28c Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into mnc-dr1.5-dev
am: eac0551992

Change-Id: Ia7fedd1202e9250d27d16dc3327b7664b134ae1f
2018-02-07 23:39:34 +00:00
Etan Cohen
c975948988 Merge "Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into mnc-dr-dev am: 0153ac9dad" into cw-e-dev
am: 84118c127f

Change-Id: Id813276417c71446dd2ac8d146888297e5a6c89c
2018-02-07 23:39:13 +00:00
Android Build Merger (Role)
f6eb193c32 Merge changes from topic "am-dac98ec1428b47c5bf6a45c28771bf33" into cw-f-dev
* changes:
  [automerger] Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into nyc-dr1-dev am: c157934e61 am: db125f50a0
  Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into nyc-dr1-dev am: c157934e61
2018-02-07 23:32:32 +00:00
Android Build Merger (Role)
f4ea18a058 Merge "Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into nyc-dr1-dev am: c157934e61" into nyc-mr1-dev 2018-02-07 23:32:32 +00:00
Android Build Merger (Role)
884a7312cf Merge "Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into nyc-mr1-dev am: a6d45d9768" into cw-f-dev 2018-02-07 23:31:58 +00:00
Android Build Merger (Role)
1b6c5ba15a Merge "Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into nyc-dev am: f780227541" into nyc-dr1-dev 2018-02-07 23:30:18 +00:00
Etan Cohen
c2f948ccc1 Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into nyc-mr1-dev
am: a6d45d9768

Change-Id: Ib9fc2e1e447a16cd2226a7235fc40f1b4cdf3641
2018-02-07 23:29:23 +00:00
Android Build Merger (Role)
afcd0fe457 [automerger] Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into nyc-dr1-dev am: c157934e61 am: db125f50a0
Change-Id: I33a67b6963995b1b91d44ae7eafd77360ccbfe73
2018-02-07 23:28:43 +00:00