Commit Graph

277920 Commits

Author SHA1 Message Date
Meng Wang
034379afd4 Add carrierconfig enhanced_4g_lte_title_variant_bool am: 542e262605 am: 2133770ea9
am: 9a39f2de34

Change-Id: I2b79fbc629a098879704a3a0bbfa8cc897035cfb
2016-08-04 03:00:16 +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
Meng Wang
2133770ea9 Add carrierconfig enhanced_4g_lte_title_variant_bool
am: 542e262605

Change-Id: Ib74946abb41f733d20469768197a8a3fe828b7f1
2016-08-04 02:25:58 +00:00
Adam Lesinski
3ee47643d9 Merge "Merge "AAPT: Fix feature split generation of ID resources" into nyc-mr1-dev am: 59a91c04cc am: 30e392e8b5" into nyc-mr1-dev-plus-aosp
am: 5f2ac03de8

Change-Id: I6c9f49a48adff3408ce18a0305b6f60eee842aa3
2016-08-04 02:23:32 +00:00
Adam Lesinski
b80271f96d Merge "AAPT: Fix feature split generation of ID resources" into nyc-mr1-dev am: 59a91c04cc am: 30e392e8b5
am: 2876ee7563

Change-Id: I27f06a4102a0a766bf0083fea4f387d6908f78dd
2016-08-04 02:23:28 +00:00
Android Build Merger (Role)
3953716612 Merge "Merge "AAPT: Fix feature split generation of ID resources am: 4d219da3c4 am: e69f9ca938" into nyc-mr1-dev-plus-aosp am: 7386f4d291" 2016-08-04 02:16:40 +00:00
Android Build Merger (Role)
2ef2cfe2a6 Merge "AAPT: Fix feature split generation of ID resources am: 4d219da3c4 am: e69f9ca938 am: 84877752ee" 2016-08-04 02:16:29 +00:00
Android Build Merger (Role)
48af0c3a1d Merge "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 am: 598f7cea13" 2016-08-04 02:16:19 +00:00
Android Build Merger (Role)
57e58ede6d Merge "docs: Updated wording of callout describing device opt-out options. am: b48909ed52 am: bdbe6fd94f am: 6c955db797 am: 82c686b714 am: 027a598c24" 2016-08-04 02:16:06 +00:00
Android Build Merger (Role)
2c5995f634 Merge "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 am: 2f37ad8919" 2016-08-04 02:15:56 +00:00
TreeHugger Robot
5f48b026f0 Merge "Enable name text field when re-using the details dialog." 2016-08-04 02:15:53 +00:00
Adam Lesinski
c758cb9fb0 Merge "AAPT: Fix feature split generation of ID resources am: 4d219da3c4 am: e69f9ca938" into nyc-mr1-dev-plus-aosp
am: 7386f4d291

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

Change-Id: I335e0fef88cd0ba7e1dd712c6659d7a799a34fbb
2016-08-04 02:12:35 +00:00
Kevin Hufnagle
25b9724575 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
am: 598f7cea13

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

Change-Id: I042e888b5bd93d5162fd4f385d1a442908856324
2016-08-04 02:12:23 +00:00
Joe Fernandez
6c74e65f51 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
am: 2f37ad8919

Change-Id: Ieac7c9709909a65b606b66fd2a5aa805769e119a
2016-08-04 02:12:12 +00:00
Joe Fernandez
fa69f7802f Merge "cherry-pick from nyc-dev: docs: Add ARC documentation TOC file" into nyc-docs am: 51a582fa85 am: 6ad22ca614 am: 2500e4a1c1 am: 657dcecc01
am: c868608c28

Change-Id: I2e54ff7e89a19126735aa46aaca5de7a55f7503d
2016-08-04 02:12:08 +00:00
Joe Fernandez
1bec7f882d 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
am: 6bce47d760

Change-Id: I199b7468cc6353cabfb1a2819695c75726725b3d
2016-08-04 02:11:57 +00:00
Joe Fernandez
ed2c39b7e7 cherry-pick from nyc-dev: docs: Add ARC documentation TOC file am: 712c053462 am: 337279df50 am: 42e485c8d2 am: e3dbc537ac
am: a16554bc4e

Change-Id: Ia050288da7ab96fc4cb14b3ede1908f3fa31c37d
2016-08-04 02:11:54 +00:00
Joe Fernandez
2f7deb1c6a Merge changes from topic 'am-0f06d118b42d48c1a4fb10bba9b021d3' into nyc-mr1-dev-plus-aosp
am: 08014f72b2

Change-Id: I202579bf56822ea8319ae1718743d7424604800d
2016-08-04 02:11:45 +00:00
Kevin Hufnagle
a77f1a07b9 Merge "docs: Migrated "Android Runtime on Chrome" pages to DAC" into nyc-docs am: d6f1d8ea28 am: 0af74fa732 am: bc10c93a2b am: 0041789097
am: 4b4b77292f

Change-Id: I126617affc684868a5430532fb7e81d42b018db7
2016-08-04 02:11:40 +00:00
Kevin Hufnagle
2d808c1062 docs: Migrated "Android Runtime on Chrome" pages to DAC am: 684d849621 am: a007a4d772 am: 6ed6297b5c am: c78cb33f58
am: b7b79d4e89

Change-Id: I85cdc136ea31f6baeff5c34625d8636eb91e1aa5
2016-08-04 02:10:23 +00:00
Kevin Hufnagle
6141a96670 docs: Added page on DAC describing ARC manifest file considerations. am: 178caa888f am: ebd455b077 am: 22f5b5c5d4 am: 3a25089697
am: d23fa5d973

Change-Id: Ifa3d8b57d4871476329d14d9ec94d0faa7859b87
2016-08-04 02:09:35 +00:00
Andre Eisenbach
aa2949840a Merge "HFP 1.7 profile update (3/4)" am: f28f6bb2b0 am: a095ee3c1d am: b522118d5e
am: f655676fa4

Change-Id: I0e329329efa1a5d1f4638361868ecb2f74f34bd2
2016-08-04 02:09:26 +00:00
Winson
24821220ae Merge "Ensuring that the dock state is opposite of the nav bar." into nyc-mr1-dev am: 96e80573e0 am: 0a0238a1ff
am: 9be912cba3

Change-Id: I5d66d1d05724b2b79e8c8a1fd098748b9cc82a37
2016-08-04 02:09:23 +00:00
Winson
a6c4c78755 Ensuring that the dock state is opposite of the nav bar. am: c54c748ede am: b1bf36532a
am: 76126808cb

Change-Id: I62f16269ed7ca43eda562a5afb15a5d75946db37
2016-08-04 02:09:20 +00:00
Svetoslav Ganov
76a896c896 Merge "Add historical logging to settings provider" into nyc-mr1-dev am: 060f882035 am: e862b1840f
am: 42e2bfc4c3

Change-Id: Ib98b0fff2edc6e3da5fdf8313fe89f4d1e58b339
2016-08-04 02:09:12 +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
Svetoslav Ganov
c8f418b347 Add historical logging to settings provider am: a340bfd7a1 am: ba92753043
am: 6ad9366b74

Change-Id: I2d64c7c97e6956fe5dc0011c8aefbca979f726a9
2016-08-04 02:00:20 +00:00
Kevin Hufnagle
6b04e41aa5 Merge "docs: Updated wording of callout describing device opt-out options. am: b48909ed52 am: bdbe6fd94f am: ad27cac28c" into nyc-mr1-dev-plus-aosp
am: 865cef09c4

Change-Id: I45201b4fb2c6116e637a3e4c0389a0a01e2296ca
2016-08-04 02:00:16 +00:00
Kevin Hufnagle
a6fc427034 docs: Updated wording of callout describing device opt-out options. am: b48909ed52 am: bdbe6fd94f am: ad27cac28c
am: 66e051ce8d

Change-Id: I5653d1318baab237a9f579a8f44b6b28e7fb1e1c
2016-08-04 02:00:13 +00:00
Joe Fernandez
9d53d34d94 Merge "Merge "cherry-pick from nyc-dev: docs: Add ARC documentation TOC file" into nyc-docs am: 51a582fa85 am: 6ad22ca614 am: 7eb5e15459" into nyc-mr1-dev-plus-aosp
am: 0d6bde82a5

Change-Id: I1abad76cefe880b259e157c72dabd48958856440
2016-08-04 02:00:04 +00:00
Joe Fernandez
2ea7e07041 Merge "cherry-pick from nyc-dev: docs: Add ARC documentation TOC file" into nyc-docs am: 51a582fa85 am: 6ad22ca614 am: 7eb5e15459
am: 8009d034b7

Change-Id: I66da0e027a7d761259878b1211a1f41ebea11e79
2016-08-04 02:00:01 +00:00
Joe Fernandez
9d2a9d2c8b Merge "cherry-pick from nyc-dev: docs: Add ARC documentation TOC file am: 712c053462 am: 337279df50 am: 55b6d40215" into nyc-mr1-dev-plus-aosp
am: dfa97d4711

Change-Id: I17de11f100bdbf7d28b9cc1869687e0b09b8ee4e
2016-08-04 01:59:49 +00:00
Joe Fernandez
5ebc1dd785 cherry-pick from nyc-dev: docs: Add ARC documentation TOC file am: 712c053462 am: 337279df50 am: 55b6d40215
am: cc9afc861b

Change-Id: Idbda8a65e00e4a42346fff6b185fe5b3727ccd55
2016-08-04 01:59:45 +00:00
Kevin Hufnagle
bca879185b Merge changes from topic 'am-c108b2f6ac234d638df065776c23ed18' into nyc-mr1-dev-plus-aosp
am: b40d6877c0

Change-Id: I35a6db7eddbb62eb29928becde2ea01731bf48ba
2016-08-04 01:59:37 +00:00
Joe Fernandez
d0f97af77d Merge "docs: Migrated "Android Runtime on Chrome" pages to DAC" into nyc-docs am: d6f1d8ea28 am: 0af74fa732 am: f87e25cabe
am: d2b02dd32b

Change-Id: I93f8ea600f2718183c6bbd0629cf1e169006107b
2016-08-04 01:59:33 +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
Joe Fernandez
c868608c28 Merge "cherry-pick from nyc-dev: docs: Add ARC documentation TOC file" into nyc-docs am: 51a582fa85 am: 6ad22ca614 am: 2500e4a1c1
am: 657dcecc01

Change-Id: Ia07889d5dc4b00c5cec7201c7416ab426c349132
2016-08-04 01:58:13 +00:00
Kevin Hufnagle
ea631ea3b1 docs: Migrated "Android Runtime on Chrome" pages to DAC am: 684d849621 am: a007a4d772 am: 299098b825
am: b6fdd3ac1e

Change-Id: I106a5721f0fa89aacb6ff8a80cab9dd59dca4cc3
2016-08-04 01:58:04 +00:00
Joe Fernandez
a16554bc4e cherry-pick from nyc-dev: docs: Add ARC documentation TOC file am: 712c053462 am: 337279df50 am: 42e485c8d2
am: e3dbc537ac

Change-Id: Iae5b40facca0caa68d311cf2ffb46952a00eccbe
2016-08-04 01:58:03 +00:00
Joe Fernandez
4b4b77292f Merge "docs: Migrated "Android Runtime on Chrome" pages to DAC" into nyc-docs am: d6f1d8ea28 am: 0af74fa732 am: bc10c93a2b
am: 0041789097

Change-Id: I010537ff0b547523f98cd68e39e3edaae43fcf6b
2016-08-04 01:57:58 +00:00
Kevin Hufnagle
b7b79d4e89 docs: Migrated "Android Runtime on Chrome" pages to DAC am: 684d849621 am: a007a4d772 am: 6ed6297b5c
am: c78cb33f58

Change-Id: I4a854cd269eda62240dc2a383aff11c70008c3c8
2016-08-04 01:57:24 +00:00