Commit Graph

265964 Commits

Author SHA1 Message Date
Bill Yi
d818f0ab1a Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 3ff12c2a1b -s ours
am: 75fda68e84  -s ours

Change-Id: Id869d5122151efbda701351f175831d7b8caf078
2016-08-04 09:34:48 +00:00
Bill Yi
10a604da5b Import translations. DO NOT MERGE am: cfd9728512 -s ours
am: 428f31db5a  -s ours

Change-Id: I5be7951a937d630ba989be1fe74dc303403c4897
2016-08-04 09:34:40 +00:00
Bill Yi
6d68c0d894 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 85c61142ab -s ours
am: 968e1d93f8  -s ours

Change-Id: I904eedd10519adbeababb8aff682d086dfa0f6b0
2016-08-04 09:34:32 +00:00
Bill Yi
46df39aa6e Import translations. DO NOT MERGE am: 4d9a70a15d -s ours
am: 692968828c  -s ours

Change-Id: I2fbcb70ba6eb93885b11067c84f7e0f7b77523d4
2016-08-04 09:34:24 +00:00
Bill Yi
3f90b7b107 Merge "Import translations. DO NOT MERGE" into cw-f-dev
am: 743426e8ba  -s ours

Change-Id: I3f73226593076a9e1c2125c6686607d3c1332e9e
2016-08-04 09:28:04 +00:00
Bill Yi
c914508185 Import translations. DO NOT MERGE
am: 6d1efa8307  -s ours

Change-Id: I5836eed702c20db1749b1f76819b83406b1da1f0
2016-08-04 09:28:01 +00:00
Bill Yi
d63d2187ae Merge "Import translations. DO NOT MERGE" into cw-f-dev
am: 344ce1fe9a  -s ours

Change-Id: I7f8f49f4dc1c12cabb98b39a02fe7d6974d12a25
2016-08-04 09:27:56 +00:00
Bill Yi
75fda68e84 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: 3ff12c2a1b  -s ours

Change-Id: Iaf9ad0d4b3d784acc891697438fadcfb3a73ab54
2016-08-04 09:27:54 +00:00
Bill Yi
0b05c18174 Import translations. DO NOT MERGE
am: 70c2429045  -s ours

Change-Id: I4559262689efe1af50261e534a204bae3d72f974
2016-08-04 09:27:53 +00:00
Bill Yi
428f31db5a Import translations. DO NOT MERGE
am: cfd9728512  -s ours

Change-Id: I421fbebb3675b3ed2b19a8bbc121426351aa4e62
2016-08-04 09:27:52 +00:00
Bill Yi
968e1d93f8 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: 85c61142ab  -s ours

Change-Id: I007993430ab0258ab6ade39a7c2f8e5705f526f8
2016-08-04 09:27:49 +00:00
Bill Yi
692968828c Import translations. DO NOT MERGE
am: 4d9a70a15d  -s ours

Change-Id: I3c251a6eebedce1013e0d0961a80a561bb28ed45
2016-08-04 09:27:47 +00:00
TreeHugger Robot
743426e8ba Merge "Import translations. DO NOT MERGE" into cw-f-dev 2016-08-04 09:19:07 +00:00
TreeHugger Robot
344ce1fe9a Merge "Import translations. DO NOT MERGE" into cw-f-dev 2016-08-04 09:18:54 +00:00
TreeHugger Robot
3ff12c2a1b Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-08-04 09:17:22 +00:00
TreeHugger Robot
85c61142ab Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-08-04 09:16:51 +00:00
Bill Yi
4d9a70a15d Import translations. DO NOT MERGE
Change-Id: I2a81de7d9ce7f2d36d5a004fd61c2bb48202525c
Auto-generated-cl: translation import
2016-08-03 22:54:00 -07:00
Bill Yi
cfd9728512 Import translations. DO NOT MERGE
Change-Id: I1b89c62d8f27b4827b77ada214c318ae7207a680
Auto-generated-cl: translation import
2016-08-03 22:39:09 -07:00
Andreas Gampe
340c4c3e69 Merge "OtaDexopt: Special-case system app classpaths" into nyc-mr1-dev am: 6bd0d6b754
am: f8f51c4c85

Change-Id: Ida20d8fd178a4b7be0d726eb80fe694559e2c12e
2016-08-04 04:37:34 +00:00
Andreas Gampe
bd70e99473 OtaDexopt: Special-case system app classpaths am: c7e02c1d2a
am: 75e88534fc

Change-Id: Id18016c8b4482d732d0aae18f5007ed6fb231c70
2016-08-04 04:37:30 +00:00
Andreas Gampe
f8f51c4c85 Merge "OtaDexopt: Special-case system app classpaths" into nyc-mr1-dev
am: 6bd0d6b754

Change-Id: I50912905578d9ab87e6a4862dd17277b522577cb
2016-08-04 04:30:09 +00:00
Andreas Gampe
75e88534fc OtaDexopt: Special-case system app classpaths
am: c7e02c1d2a

Change-Id: I11bdba24aec736f1ef3e1023acab63a9680c6183
2016-08-04 04:30:07 +00:00
TreeHugger Robot
6bd0d6b754 Merge "OtaDexopt: Special-case system app classpaths" into nyc-mr1-dev 2016-08-04 03:35:36 +00:00
Sreevani Sreejith
dc0c814a51 Merge "resolve merge conflicts of 9d47cae to nyc-docs" into nyc-docs am: 3faf6114b0 am: f5a2fbc156 am: 6421beee8e
am: f8cd903c7a

Change-Id: I378f57f17d577455f4315f3c85a5c297bb8eb632
2016-08-04 03:12:28 +00:00
sreevanis
5ad1139db7 resolve merge conflicts of 9d47cae to nyc-docs am: d5cabb92bc am: fdaac48e99 am: 8888f02222
am: 55057fed8f

Change-Id: I1e3c00426f4fc9864db047ca423845d86f4543a7
2016-08-04 03:12:22 +00:00
sreevanis
f8cd903c7a Merge "resolve merge conflicts of 9d47cae to nyc-docs" into nyc-docs am: 3faf6114b0 am: f5a2fbc156
am: 6421beee8e

Change-Id: I8523ef90758ec7f16b702cdbc81d4009076b0461
2016-08-04 02:58:29 +00:00
sreevanis
55057fed8f resolve merge conflicts of 9d47cae to nyc-docs am: d5cabb92bc am: fdaac48e99
am: 8888f02222

Change-Id: Ic41b030beb3ebf71baf78bd52abfb801f7f086cf
2016-08-04 02:58:27 +00:00
sreevanis
d93f293098 Merge "resolve merge conflicts of 9d47cae to nyc-docs" into nyc-docs am: 3faf6114b0 am: f5a2fbc156
am: ec62c0780f

Change-Id: I87e184de26394bf6c8dd29f0c3c40ecaa7ce42a9
2016-08-04 02:51:42 +00:00
sreevanis
31e80831cc resolve merge conflicts of 9d47cae to nyc-docs am: d5cabb92bc am: fdaac48e99
am: a56d5f9583

Change-Id: Ie4afafcd26cb7827de5563a89e083c3c76ac14e9
2016-08-04 02:51:37 +00:00
Meng Wang
d558dc0a9f Merge "Add carrierconfig enhanced_4g_lte_title_variant_bool" into nyc-mr1-dev am: d51b23564f
am: 1f79faa5e6

Change-Id: Icae0a22cd7e4a9b05ebea810fa2a2f52f0fe0d20
2016-08-04 02:38:55 +00:00
Sreevani Sreejith
6421beee8e Merge "resolve merge conflicts of 9d47cae to nyc-docs" into nyc-docs am: 3faf6114b0
am: f5a2fbc156

Change-Id: I37eb8462dcf65783d64c71336ee0d7fc8a354c4e
2016-08-04 02:38:47 +00:00
sreevanis
8888f02222 resolve merge conflicts of 9d47cae to nyc-docs am: d5cabb92bc
am: fdaac48e99

Change-Id: I8a1aa4000efa91d07d2d90dc8dd8938b30aed919
2016-08-04 02:38:44 +00:00
Meng Wang
9a39f2de34 Add carrierconfig enhanced_4g_lte_title_variant_bool am: 542e262605
am: 2133770ea9

Change-Id: I992ed8265fc9f6d028e1f765b3e98dd33cb2add4
2016-08-04 02:37:35 +00:00
Sreevani Sreejith
ec62c0780f Merge "resolve merge conflicts of 9d47cae to nyc-docs" into nyc-docs am: 3faf6114b0
am: f5a2fbc156

Change-Id: I914433dbb9ab473d9dc14b317478af0a1db92e23
2016-08-04 02:37:12 +00:00
sreevanis
a56d5f9583 resolve merge conflicts of 9d47cae to nyc-docs am: d5cabb92bc
am: fdaac48e99

Change-Id: I525b4b81660dfd21e7ef992ee803f94d58c629b9
2016-08-04 02:37:09 +00:00
Meng Wang
1f79faa5e6 Merge "Add carrierconfig enhanced_4g_lte_title_variant_bool" into nyc-mr1-dev
am: d51b23564f

Change-Id: I5656b0e866b5a21c635be8e81734cb5642fc61df
2016-08-04 02:26:10 +00:00
Meng Wang
2133770ea9 Add carrierconfig enhanced_4g_lte_title_variant_bool
am: 542e262605

Change-Id: Ib74946abb41f733d20469768197a8a3fe828b7f1
2016-08-04 02:25:58 +00:00
sreevanis
f5a2fbc156 Merge "resolve merge conflicts of 9d47cae to nyc-docs" into nyc-docs
am: 3faf6114b0

Change-Id: I80e8d39a9d6f58e2cc3091690f202d1453a6b8e6
2016-08-04 02:23:43 +00:00
sreevanis
fdaac48e99 resolve merge conflicts of 9d47cae to nyc-docs
am: d5cabb92bc

Change-Id: Ie16cc1707e8cff7eaa2691c7e9257a26bc6aeead
2016-08-04 02:23:39 +00:00
Sreevani Sreejith
3faf6114b0 Merge "resolve merge conflicts of 9d47cae to nyc-docs" into nyc-docs 2016-08-04 02:14:26 +00:00
Meng Wang
d51b23564f Merge "Add carrierconfig enhanced_4g_lte_title_variant_bool" into nyc-mr1-dev 2016-08-04 02:12:14 +00:00
Android Build Merger (Role)
5f2ac03de8 Merge "Merge "AAPT: Fix feature split generation of ID resources" into nyc-mr1-dev am: 59a91c04cc am: 30e392e8b5" into nyc-mr1-dev-plus-aosp 2016-08-04 02:01:25 +00:00
Android Build Merger (Role)
7386f4d291 Merge "AAPT: Fix feature split generation of ID resources am: 4d219da3c4 am: e69f9ca938" into nyc-mr1-dev-plus-aosp 2016-08-04 02:01:14 +00:00
Android Build Merger (Role)
598f7cea13 Merge "docs: Updated wording of callout describing device opt-out options. am: b48909ed52 am: bdbe6fd94f am: 6c955db797 am: 82c686b714" into nyc-mr1-dev-plus-aosp 2016-08-04 02:01:03 +00:00
Adam Lesinski
2876ee7563 Merge "AAPT: Fix feature split generation of ID resources" into nyc-mr1-dev am: 59a91c04cc
am: 30e392e8b5

Change-Id: I46dc871a2f4cb8bf8d9e3c222af0e110445ca956
2016-08-04 02:00:32 +00:00
Adam Lesinski
84877752ee AAPT: Fix feature split generation of ID resources am: 4d219da3c4
am: e69f9ca938

Change-Id: I2021dbffcd9e6fb8bca79c181d2bf8e8524ee5d2
2016-08-04 02:00:28 +00:00
Kevin Hufnagle
027a598c24 docs: Updated wording of callout describing device opt-out options. am: b48909ed52 am: bdbe6fd94f am: 6c955db797
am: 82c686b714

Change-Id: I7d4638b658886d729daf25d186b9735a9aea28a9
2016-08-04 02:00:22 +00:00
Android Build Merger (Role)
2f37ad8919 Merge "Merge "cherry-pick from nyc-dev: docs: Add ARC documentation TOC file" into nyc-docs am: 51a582fa85 am: 6ad22ca614 am: 2500e4a1c1 am: 657dcecc01" into nyc-mr1-dev-plus-aosp 2016-08-04 01:59:28 +00:00
Android Build Merger (Role)
6bce47d760 Merge "cherry-pick from nyc-dev: docs: Add ARC documentation TOC file am: 712c053462 am: 337279df50 am: 42e485c8d2 am: e3dbc537ac" into nyc-mr1-dev-plus-aosp 2016-08-04 01:59:18 +00:00
Android Build Merger (Role)
08014f72b2 Merge changes from topic 'am-0f06d118b42d48c1a4fb10bba9b021d3' into nyc-mr1-dev-plus-aosp
* changes:
  Merge "docs: Migrated "Android Runtime on Chrome" pages to DAC" into nyc-docs am: d6f1d8ea28 am: 0af74fa732 am: bc10c93a2b am: 0041789097
  docs: Migrated "Android Runtime on Chrome" pages to DAC am: 684d849621 am: a007a4d772 am: 6ed6297b5c am: c78cb33f58
  docs: Added page on DAC describing ARC manifest file considerations. am: 178caa888f am: ebd455b077 am: 22f5b5c5d4 am: 3a25089697
2016-08-04 01:59:05 +00:00