tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
39372 commits 1 branch 0 tags 119 MiB
Commit graph

39372 commits

This branch
This branch
All branches
Author SHA1 Message Date
Adam Seaton
b43ff9d8f5 [DO NOT MERGE] Update platform security String to 2018-12-01 
bug:117667960
 2018-10-12 14:11:24 -07:00
Adam Seaton
281cb3b172 [DO NOT MERGE] Update platform security string to 2018-11-05 on 
oc-mr1-dev
bug:114110585
 2018-09-10 16:42:41 -07:00
Adam Seaton
b703503c1d [DO NOT MERGE] Update platform security string to 2018-11-01 on oc-mr1-dev 
Bug:114110585
 2018-09-10 16:37:40 -07:00
JP Sugarbroad
aebb4e4c60 Merge changes from topic "am-b8fbc025-dd1b-4d0d-90bb-1a3f2f2e8d15" into oc-dev am: 3266dbabf9 
am: 073a48b27d

Change-Id: I298dbc1500895ff6d3802008ad636f74482e2fd3
 2018-09-10 15:06:18 -07:00
JP Sugarbroad
839e8e5621 [automerger] [RESTRICT AUTOMERGE] Add new Android.mk to handle repo move am: fd72eaab91 am: 69d914c57b am: 5c6df3c9a2 am: cd5dfa01ed skipped: 428866c804 am: 58265f83b2 
am: 422182a1ac

Change-Id: Idefb550cc541e6e59c2d208b9c08fa110636def5
 2018-09-10 15:05:14 -07:00
JP Sugarbroad
073a48b27d Merge changes from topic "am-b8fbc025-dd1b-4d0d-90bb-1a3f2f2e8d15" into oc-dev 
am: 3266dbabf9

Change-Id: I7cb706927b8b155820c74d8c8635b4b0fac377d5
 2018-09-10 15:00:53 -07:00
JP Sugarbroad
422182a1ac [automerger] [RESTRICT AUTOMERGE] Add new Android.mk to handle repo move am: fd72eaab91 am: 69d914c57b am: 5c6df3c9a2 am: cd5dfa01ed skipped: 428866c804 
am: 58265f83b2

Change-Id: I7b25a2885d197236a0ad8ccd6fe53f272a5fb3b3
 2018-09-10 14:59:16 -07:00
JP Sugarbroad
3266dbabf9 Merge changes from topic "am-b8fbc025-dd1b-4d0d-90bb-1a3f2f2e8d15" into oc-dev 
* changes:
  [automerger] [RESTRICT AUTOMERGE] Remove build/libs am: 62a11cf698 am: 41a932d505 am: 2df512843f am: f74efccc8d skipped: 0c824a631e
  [automerger] [RESTRICT AUTOMERGE] Remove build/libs am: 62a11cf698 am: 41a932d505 am: 2df512843f am: f74efccc8d
  [automerger] [RESTRICT AUTOMERGE] Remove build/libs am: 62a11cf698 am: 41a932d505 am: 2df512843f
  [automerger] [RESTRICT AUTOMERGE] Remove build/libs am: 62a11cf698 am: 41a932d505
  [automerger] [RESTRICT AUTOMERGE] Remove build/libs am: 62a11cf698
  [RESTRICT AUTOMERGE] Remove build/libs
 2018-09-10 21:49:21 +00:00
Adam Seaton
090027fb46 DO NOT MERGE Update platform security string to 2018-10-05 
bug:112535135
 2018-08-13 18:41:41 +00:00
Android Build Merger (Role)
58265f83b2 [automerger] [RESTRICT AUTOMERGE] Add new Android.mk to handle repo move am: fd72eaab91 am: 69d914c57b am: 5c6df3c9a2 am: cd5dfa01ed skipped: 428866c804 
Change-Id: I3d887e3be355404a171b84fe02111ec35ca29887
 2018-07-20 00:08:12 +00:00
Android Build Merger (Role)
428866c804 [automerger] [RESTRICT AUTOMERGE] Add new Android.mk to handle repo move am: fd72eaab91 am: 69d914c57b am: 5c6df3c9a2 am: cd5dfa01ed 
Change-Id: Iec882319f93d829c4721bbeec852f5eafdec538d
 2018-07-20 00:08:11 +00:00
Android Build Merger (Role)
cd5dfa01ed [automerger] [RESTRICT AUTOMERGE] Add new Android.mk to handle repo move am: fd72eaab91 am: 69d914c57b am: 5c6df3c9a2 
Change-Id: I2ef3465b53d7fdbac1ec53bd6aead997234c2d4e
 2018-07-20 00:08:10 +00:00
Android Build Merger (Role)
5c6df3c9a2 [automerger] [RESTRICT AUTOMERGE] Add new Android.mk to handle repo move am: fd72eaab91 am: 69d914c57b 
Change-Id: Ic00e7b9ba3443b444528092b1e0fba62182fb25c
 2018-07-20 00:08:08 +00:00
Android Build Merger (Role)
69d914c57b [automerger] [RESTRICT AUTOMERGE] Add new Android.mk to handle repo move am: fd72eaab91 
Change-Id: I3525350c7efdc6566fd9999e90610809c132d6b8
 2018-07-20 00:08:06 +00:00
JP Sugarbroad
fd72eaab91 [RESTRICT AUTOMERGE] Add new Android.mk to handle repo move 
We're moving the platform/build repository down a level, then symlinking
the directories and necessary files back into build/. So if we're still
in build/, keep searching for Android.mk files, otherwise stop, since
they'll be found through the symlinks.

Bug: 109817231
Change-Id: I057957e9b201c14dee185f9c00df157f178d8a31
 2018-07-20 00:08:05 +00:00
Android Build Merger (Role)
ef7d325c7f [automerger] [RESTRICT AUTOMERGE] Remove build/libs am: 62a11cf698 am: 41a932d505 am: 2df512843f am: f74efccc8d skipped: 0c824a631e 
Change-Id: Ifd7d207bb75af2019ddb2c0c07e93a864af9633d
 2018-07-19 22:53:15 +00:00
Android Build Merger (Role)
0c824a631e [automerger] [RESTRICT AUTOMERGE] Remove build/libs am: 62a11cf698 am: 41a932d505 am: 2df512843f am: f74efccc8d 
Change-Id: I1a5c817c43b712148c2d88398c9e27d879ded8cc
 2018-07-19 22:53:14 +00:00
Android Build Merger (Role)
f74efccc8d [automerger] [RESTRICT AUTOMERGE] Remove build/libs am: 62a11cf698 am: 41a932d505 am: 2df512843f 
Change-Id: Ifc4833e72b81040b196bf112d249c01a8c8e9763
 2018-07-19 22:53:12 +00:00
Android Build Merger (Role)
2df512843f [automerger] [RESTRICT AUTOMERGE] Remove build/libs am: 62a11cf698 am: 41a932d505 
Change-Id: I6d931b90bbd08c2b7112a0ab514bca1a5f3aa044
 2018-07-19 22:53:11 +00:00
Android Build Merger (Role)
41a932d505 [automerger] [RESTRICT AUTOMERGE] Remove build/libs am: 62a11cf698 
Change-Id: Iea5ed8a8a41c54f07d74e65b5babdabc166426a9
 2018-07-19 22:53:09 +00:00
JP Sugarbroad
62a11cf698 [RESTRICT AUTOMERGE] Remove build/libs 
There's only a single library, libhost, and it's only used by acp and
atree in build/tools, move it there.

Bug: 109817231
Change-Id: Ifa58e58958d90fad008eb87a7eef4876b57b9edd
 2018-07-19 22:53:08 +00:00
Adam Seaton
6bc223c9af Updating Platform Security String to 2018-09-05 
Bug: 111501777
 2018-07-16 10:17:21 -07:00
Adam Seaton
f6bee62b8e [DO NOT MERGE] Update Platform Security String to 2018-08-05 for August 
Bug:109889880
 2018-06-18 17:28:17 +00:00
TreeHugger Robot
64cc99f197 Merge "DO NOT MERGE: Update Platform Security String to 2018-07-05 for oc-mr1-dev Bug:79883349" into oc-mr1-dev 2018-06-02 01:10:13 +00:00
Adam Seaton
cfbe84b8a0 DO NOT MERGE: Update Platform Security String to 2018-07-05 for oc-mr1-dev 
Bug:79883349
 2018-06-01 23:00:36 +00:00
Tao Bao
74dfbb8588 releasetools: Skip checking files with non-monotonic ranges. 
Bug: 79951743
Test: Run validate_target_files.py on target_files.zip that has
      non-monotonic ranges listed in IMAGES/system.map.
Change-Id: I28d3ca6972d361362589cd51e60731af9994a551
Merged-In: I28d3ca6972d361362589cd51e60731af9994a551
(cherry picked from commit d32936d657)
 2018-05-17 21:30:03 -07:00
TreeHugger Robot
d653d7a02a Merge "Add OWNERS for version_defaults.mk" into oc-mr1-dev 2018-05-16 21:37:05 +00:00
Dan Willemsen
a7015e40c7 Add OWNERS for version_defaults.mk 
Bug: 79775736
Change-Id: Ifaf042672598758bde0a4434b219f828d432fca7
Merged-In: Ifaf042672598758bde0a4434b219f828d432fca7
 2018-05-16 06:47:04 +00:00
Adam Seaton
85a18252b7 DO NOT MERGE: Updating security string for oc-mr1-dev to 2018-06-05 
Bug:78240102
Change-Id: Ib9d8c11ecf9212711a9679972c15354c8dd56857
 2018-04-18 21:25:50 +00:00
TreeHugger Robot
3bdafad5b0 Merge "DO NOT MERGE Updating security string for oc-mr1-dev to 2018-05-05" into oc-mr1-dev 2018-03-14 21:58:27 +00:00
Adam Seaton
47e4c77438 [automerger] [DO NOT MERGE] Updating security string for nyc-dev to 2018-05-01 bug: 74345861 am: 7c0f23dce5 am: 21f45f7edc am: 5a2c0096d5 am: bc62637ffa skipped: 262656a47f am: c3dd369446 
am: 98086a211c

Change-Id: Icbb289c0edd5f754f1ae4b180376163e4c3f6879
 2018-03-14 00:33:23 +00:00
Adam Seaton
98086a211c [automerger] [DO NOT MERGE] Updating security string for nyc-dev to 2018-05-01 bug: 74345861 am: 7c0f23dce5 am: 21f45f7edc am: 5a2c0096d5 am: bc62637ffa skipped: 262656a47f 
am: c3dd369446

Change-Id: If6822cab153c266841fc35fcfa2bb38a4ef4ab95
 2018-03-14 00:26:02 +00:00
Android Build Merger (Role)
c3dd369446 [automerger] [DO NOT MERGE] Updating security string for nyc-dev to 2018-05-01 bug: 74345861 am: 7c0f23dce5 am: 21f45f7edc am: 5a2c0096d5 am: bc62637ffa skipped: 262656a47f 
Change-Id: Ib99dd412a286ea7ce26bf4cc7b3c74f85bf2d401
 2018-03-13 20:28:19 +00:00
Android Build Merger (Role)
262656a47f [automerger] [DO NOT MERGE] Updating security string for nyc-dev to 2018-05-01 bug: 74345861 am: 7c0f23dce5 am: 21f45f7edc am: 5a2c0096d5 am: bc62637ffa 
Change-Id: Ia8a4c064fb9a75b18745d0634e20925424d66153
 2018-03-13 20:28:15 +00:00
Android Build Merger (Role)
bc62637ffa [automerger] [DO NOT MERGE] Updating security string for nyc-dev to 2018-05-01 bug: 74345861 am: 7c0f23dce5 am: 21f45f7edc am: 5a2c0096d5 
Change-Id: If3c74fdc2e91e9fbda025a98d284d985511de428
 2018-03-13 20:28:12 +00:00
Android Build Merger (Role)
5a2c0096d5 [automerger] [DO NOT MERGE] Updating security string for nyc-dev to 2018-05-01 bug: 74345861 am: 7c0f23dce5 am: 21f45f7edc 
Change-Id: I50d425d04ba922293f6cb6a8003af8ca46dc03d4
 2018-03-13 20:28:10 +00:00
Android Build Merger (Role)
21f45f7edc [automerger] [DO NOT MERGE] Updating security string for nyc-dev to 2018-05-01 bug: 74345861 am: 7c0f23dce5 
Change-Id: I3e1a3207a870268adb780b2355bcd53bb2a71467
 2018-03-13 20:28:07 +00:00
Adam Seaton
7c0f23dce5 [DO NOT MERGE] Updating security string for nyc-dev to 2018-05-01 
bug: 74345861
 2018-03-13 13:27:02 -07:00
Adam Seaton
cd85c0da4a DO NOT MERGE Updating security string for oc-mr1-dev to 2018-05-05 
Bug: 74345861
Change-Id: I85a9878bfd441bc95242023f713b6848992bea06
 2018-03-13 13:04:40 -07:00
Adam Seaton
cf071d11f7 Merge changes from topics "am-3c619e2a-1f4e-47aa-8753-e1a28443a34e", "am-9f861bb0-3c66-4edc-8d28-54a30e085c78" into oc-dev am: db07ca24cd 
am: 73acc9e68a

Change-Id: If83dbff09b778e82911f9f090a88f58bf9a28c6e
 2018-02-14 19:02:13 +00:00
Adam Seaton
73acc9e68a Merge changes from topics "am-3c619e2a-1f4e-47aa-8753-e1a28443a34e", "am-9f861bb0-3c66-4edc-8d28-54a30e085c78" into oc-dev 
am: db07ca24cd

Change-Id: I738712b5f72e44b3defdb2fecca60c60a77c4433
 2018-02-14 18:56:01 +00:00
TreeHugger Robot
db07ca24cd Merge changes from topics "am-3c619e2a-1f4e-47aa-8753-e1a28443a34e", "am-9f861bb0-3c66-4edc-8d28-54a30e085c78" into oc-dev 
* changes:
  [automerger skipped] [DO NOT MERGE] Update Security String to 2018-04-01 Bug: 73240847 skipped: 5b07fbe498 skipped: ab40f0170c skipped: df3319a7fb skipped: ccd891285c skipped: dd276ca966 skipped: 8501efda49 skipped: 14f5e7822e skipped: a827c465de skipped: skipped: c73989b3fc
  [automerger skipped] [DO NOT MERGE] Update Security String to 2018-04-01 Bug: 73240847 skipped: 5b07fbe498 skipped: ab40f0170c skipped: df3319a7fb skipped: ccd891285c skipped: dd276ca966 skipped: 8501efda49 skipped: 14f5e7822e skipped: a827c465de skipped: 7dbf8e1467
  [automerger skipped] [DO NOT MERGE] Update Security String to 2018-04-01 Bug: 73240847 skipped: 5b07fbe498 skipped: ab40f0170c skipped: df3319a7fb skipped: ccd891285c skipped: dd276ca966 skipped: 8501efda49 skipped: 14f5e7822e skipped: a827c465de
  [automerger skipped] [DO NOT MERGE] Update Security String to 2018-04-01 Bug: 73240847 skipped: 5b07fbe498 skipped: ab40f0170c skipped: df3319a7fb skipped: ccd891285c skipped: dd276ca966 skipped: 8501efda49 skipped: 14f5e7822e
  [automerger skipped] [DO NOT MERGE] Update Security String to 2018-04-01 Bug: 73240847 skipped: 5b07fbe498 skipped: ab40f0170c skipped: df3319a7fb skipped: ccd891285c skipped: dd276ca966 skipped: 8501efda49
  [automerger skipped] [DO NOT MERGE] Update Security String to 2018-04-01 Bug: 73240847 skipped: 5b07fbe498 skipped: ab40f0170c skipped: df3319a7fb skipped: ccd891285c skipped: dd276ca966
  [automerger skipped] [DO NOT MERGE] Update Security String to 2018-04-01 Bug: 73240847 skipped: 5b07fbe498 skipped: ab40f0170c skipped: df3319a7fb skipped: ccd891285c
  [automerger skipped] [DO NOT MERGE] Update Security String to 2018-04-01 Bug: 73240847 skipped: 5b07fbe498 skipped: ab40f0170c skipped: df3319a7fb
  [automerger skipped] [DO NOT MERGE] Update Security String to 2018-04-01 Bug: 73240847 skipped: 5b07fbe498 skipped: ab40f0170c
  [automerger skipped] [DO NOT MERGE] Update Security String to 2018-04-01 Bug: 73240847 skipped: 5b07fbe498
  [automerger skipped] [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01 Bug:71860241 skipped: 014165cb84 skipped: a80adf5681 skipped: 6dc142b573 skipped: b384901f8e skipped: a359a0a255 skipped: 9108464768 skipped: e621f5b6b1 skipped: affcc08a8e skipped:  skipped: aa694967c6
  [automerger skipped] [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01 Bug:71860241 skipped: 014165cb84 skipped: a80adf5681 skipped: 6dc142b573 skipped: b384901f8e skipped: a359a0a255 skipped: 9108464768 skipped: e621f5b6b1 skipped: affcc08a8e skipped: 01433de204
  [automerger skipped] [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01 Bug:71860241 skipped: 014165cb84 skipped: a80adf5681 skipped: 6dc142b573 skipped: b384901f8e skipped: a359a0a255 skipped: 9108464768 skipped: e621f5b6b1 skipped: affcc08a8e
  [automerger skipped] [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01 Bug:71860241 skipped: 014165cb84 skipped: a80adf5681 skipped: 6dc142b573 skipped: b384901f8e skipped: a359a0a255 skipped: 9108464768 skipped: e621f5b6b1
  [automerger skipped] [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01 Bug:71860241 skipped: 014165cb84 skipped: a80adf5681 skipped: 6dc142b573 skipped: b384901f8e skipped: a359a0a255 skipped: 9108464768
  [automerger skipped] [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01 Bug:71860241 skipped: 014165cb84 skipped: a80adf5681 skipped: 6dc142b573 skipped: b384901f8e skipped: a359a0a255
  [automerger skipped] [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01 Bug:71860241 skipped: 014165cb84 skipped: a80adf5681 skipped: 6dc142b573 skipped: b384901f8e
  [automerger skipped] [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01 Bug:71860241 skipped: 014165cb84 skipped: a80adf5681 skipped: 6dc142b573
  [automerger skipped] [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01 Bug:71860241 skipped: 014165cb84 skipped: a80adf5681
  [automerger skipped] [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01 Bug:71860241 skipped: 014165cb84
  [DO NOT MERGE] Update Security String to 2018-04-01 Bug: 73240847
  [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01 Bug:71860241
 2018-02-14 18:43:37 +00:00
TreeHugger Robot
fd3973733a Merge changes from topics "am-3c619e2a-1f4e-47aa-8753-e1a28443a34e", "am-9f861bb0-3c66-4edc-8d28-54a30e085c78" into nyc-mr2-dev 
* changes:
  [automerger skipped] [DO NOT MERGE] Update Security String to 2018-04-01 Bug: 73240847 skipped: 5b07fbe498 skipped: ab40f0170c skipped: df3319a7fb skipped: ccd891285c skipped: dd276ca966 skipped: 8501efda49 skipped: 14f5e7822e skipped: a827c465de skipped: 7dbf8e1467
  [automerger skipped] [DO NOT MERGE] Update Security String to 2018-04-01 Bug: 73240847 skipped: 5b07fbe498 skipped: ab40f0170c skipped: df3319a7fb skipped: ccd891285c skipped: dd276ca966 skipped: 8501efda49 skipped: 14f5e7822e skipped: a827c465de
  [automerger skipped] [DO NOT MERGE] Update Security String to 2018-04-01 Bug: 73240847 skipped: 5b07fbe498 skipped: ab40f0170c skipped: df3319a7fb skipped: ccd891285c skipped: dd276ca966 skipped: 8501efda49 skipped: 14f5e7822e
  [automerger skipped] [DO NOT MERGE] Update Security String to 2018-04-01 Bug: 73240847 skipped: 5b07fbe498 skipped: ab40f0170c skipped: df3319a7fb skipped: ccd891285c skipped: dd276ca966 skipped: 8501efda49
  [automerger skipped] [DO NOT MERGE] Update Security String to 2018-04-01 Bug: 73240847 skipped: 5b07fbe498 skipped: ab40f0170c skipped: df3319a7fb skipped: ccd891285c skipped: dd276ca966
  [automerger skipped] [DO NOT MERGE] Update Security String to 2018-04-01 Bug: 73240847 skipped: 5b07fbe498 skipped: ab40f0170c skipped: df3319a7fb skipped: ccd891285c
  [automerger skipped] [DO NOT MERGE] Update Security String to 2018-04-01 Bug: 73240847 skipped: 5b07fbe498 skipped: ab40f0170c skipped: df3319a7fb
  [automerger skipped] [DO NOT MERGE] Update Security String to 2018-04-01 Bug: 73240847 skipped: 5b07fbe498 skipped: ab40f0170c
  [automerger skipped] [DO NOT MERGE] Update Security String to 2018-04-01 Bug: 73240847 skipped: 5b07fbe498
  [automerger skipped] [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01 Bug:71860241 skipped: 014165cb84 skipped: a80adf5681 skipped: 6dc142b573 skipped: b384901f8e skipped: a359a0a255 skipped: 9108464768 skipped: e621f5b6b1 skipped: affcc08a8e skipped: 01433de204
  [automerger skipped] [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01 Bug:71860241 skipped: 014165cb84 skipped: a80adf5681 skipped: 6dc142b573 skipped: b384901f8e skipped: a359a0a255 skipped: 9108464768 skipped: e621f5b6b1 skipped: affcc08a8e
  [automerger skipped] [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01 Bug:71860241 skipped: 014165cb84 skipped: a80adf5681 skipped: 6dc142b573 skipped: b384901f8e skipped: a359a0a255 skipped: 9108464768 skipped: e621f5b6b1
  [automerger skipped] [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01 Bug:71860241 skipped: 014165cb84 skipped: a80adf5681 skipped: 6dc142b573 skipped: b384901f8e skipped: a359a0a255 skipped: 9108464768
  [automerger skipped] [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01 Bug:71860241 skipped: 014165cb84 skipped: a80adf5681 skipped: 6dc142b573 skipped: b384901f8e skipped: a359a0a255
  [automerger skipped] [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01 Bug:71860241 skipped: 014165cb84 skipped: a80adf5681 skipped: 6dc142b573 skipped: b384901f8e
  [automerger skipped] [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01 Bug:71860241 skipped: 014165cb84 skipped: a80adf5681 skipped: 6dc142b573
  [automerger skipped] [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01 Bug:71860241 skipped: 014165cb84 skipped: a80adf5681
  [automerger skipped] [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01 Bug:71860241 skipped: 014165cb84
  [DO NOT MERGE] Update Security String to 2018-04-01 Bug: 73240847
  [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01 Bug:71860241
 2018-02-14 18:43:37 +00:00
TreeHugger Robot
8c74825d49 Merge changes from topics "am-3c619e2a-1f4e-47aa-8753-e1a28443a34e", "am-9f861bb0-3c66-4edc-8d28-54a30e085c78" into cw-f-dev 
* changes:
  [automerger skipped] [DO NOT MERGE] Update Security String to 2018-04-01 Bug: 73240847 skipped: 5b07fbe498 skipped: ab40f0170c skipped: df3319a7fb skipped: ccd891285c skipped: dd276ca966 skipped: 8501efda49 skipped: 14f5e7822e skipped: a827c465de
  [automerger skipped] [DO NOT MERGE] Update Security String to 2018-04-01 Bug: 73240847 skipped: 5b07fbe498 skipped: ab40f0170c skipped: df3319a7fb skipped: ccd891285c skipped: dd276ca966 skipped: 8501efda49 skipped: 14f5e7822e
  [automerger skipped] [DO NOT MERGE] Update Security String to 2018-04-01 Bug: 73240847 skipped: 5b07fbe498 skipped: ab40f0170c skipped: df3319a7fb skipped: ccd891285c skipped: dd276ca966 skipped: 8501efda49
  [automerger skipped] [DO NOT MERGE] Update Security String to 2018-04-01 Bug: 73240847 skipped: 5b07fbe498 skipped: ab40f0170c skipped: df3319a7fb skipped: ccd891285c skipped: dd276ca966
  [automerger skipped] [DO NOT MERGE] Update Security String to 2018-04-01 Bug: 73240847 skipped: 5b07fbe498 skipped: ab40f0170c skipped: df3319a7fb skipped: ccd891285c
  [automerger skipped] [DO NOT MERGE] Update Security String to 2018-04-01 Bug: 73240847 skipped: 5b07fbe498 skipped: ab40f0170c skipped: df3319a7fb
  [automerger skipped] [DO NOT MERGE] Update Security String to 2018-04-01 Bug: 73240847 skipped: 5b07fbe498 skipped: ab40f0170c
  [automerger skipped] [DO NOT MERGE] Update Security String to 2018-04-01 Bug: 73240847 skipped: 5b07fbe498
  [automerger skipped] [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01 Bug:71860241 skipped: 014165cb84 skipped: a80adf5681 skipped: 6dc142b573 skipped: b384901f8e skipped: a359a0a255 skipped: 9108464768 skipped: e621f5b6b1 skipped: affcc08a8e
  [automerger skipped] [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01 Bug:71860241 skipped: 014165cb84 skipped: a80adf5681 skipped: 6dc142b573 skipped: b384901f8e skipped: a359a0a255 skipped: 9108464768 skipped: e621f5b6b1
  [automerger skipped] [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01 Bug:71860241 skipped: 014165cb84 skipped: a80adf5681 skipped: 6dc142b573 skipped: b384901f8e skipped: a359a0a255 skipped: 9108464768
  [automerger skipped] [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01 Bug:71860241 skipped: 014165cb84 skipped: a80adf5681 skipped: 6dc142b573 skipped: b384901f8e skipped: a359a0a255
  [automerger skipped] [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01 Bug:71860241 skipped: 014165cb84 skipped: a80adf5681 skipped: 6dc142b573 skipped: b384901f8e
  [automerger skipped] [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01 Bug:71860241 skipped: 014165cb84 skipped: a80adf5681 skipped: 6dc142b573
  [automerger skipped] [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01 Bug:71860241 skipped: 014165cb84 skipped: a80adf5681
  [automerger skipped] [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01 Bug:71860241 skipped: 014165cb84
  [DO NOT MERGE] Update Security String to 2018-04-01 Bug: 73240847
  [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01 Bug:71860241
 2018-02-14 18:43:37 +00:00
TreeHugger Robot
3fdd107066 Merge changes from topics "am-3c619e2a-1f4e-47aa-8753-e1a28443a34e", "am-9f861bb0-3c66-4edc-8d28-54a30e085c78" into nyc-mr1-dev 
* changes:
  [automerger skipped] [DO NOT MERGE] Update Security String to 2018-04-01 Bug: 73240847 skipped: 5b07fbe498 skipped: ab40f0170c skipped: df3319a7fb skipped: ccd891285c skipped: dd276ca966 skipped: 8501efda49 skipped: 14f5e7822e
  [automerger skipped] [DO NOT MERGE] Update Security String to 2018-04-01 Bug: 73240847 skipped: 5b07fbe498 skipped: ab40f0170c skipped: df3319a7fb skipped: ccd891285c skipped: dd276ca966 skipped: 8501efda49
  [automerger skipped] [DO NOT MERGE] Update Security String to 2018-04-01 Bug: 73240847 skipped: 5b07fbe498 skipped: ab40f0170c skipped: df3319a7fb skipped: ccd891285c skipped: dd276ca966
  [automerger skipped] [DO NOT MERGE] Update Security String to 2018-04-01 Bug: 73240847 skipped: 5b07fbe498 skipped: ab40f0170c skipped: df3319a7fb skipped: ccd891285c
  [automerger skipped] [DO NOT MERGE] Update Security String to 2018-04-01 Bug: 73240847 skipped: 5b07fbe498 skipped: ab40f0170c skipped: df3319a7fb
  [automerger skipped] [DO NOT MERGE] Update Security String to 2018-04-01 Bug: 73240847 skipped: 5b07fbe498 skipped: ab40f0170c
  [automerger skipped] [DO NOT MERGE] Update Security String to 2018-04-01 Bug: 73240847 skipped: 5b07fbe498
  [automerger skipped] [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01 Bug:71860241 skipped: 014165cb84 skipped: a80adf5681 skipped: 6dc142b573 skipped: b384901f8e skipped: a359a0a255 skipped: 9108464768 skipped: e621f5b6b1
  [automerger skipped] [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01 Bug:71860241 skipped: 014165cb84 skipped: a80adf5681 skipped: 6dc142b573 skipped: b384901f8e skipped: a359a0a255 skipped: 9108464768
  [automerger skipped] [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01 Bug:71860241 skipped: 014165cb84 skipped: a80adf5681 skipped: 6dc142b573 skipped: b384901f8e skipped: a359a0a255
  [automerger skipped] [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01 Bug:71860241 skipped: 014165cb84 skipped: a80adf5681 skipped: 6dc142b573 skipped: b384901f8e
  [automerger skipped] [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01 Bug:71860241 skipped: 014165cb84 skipped: a80adf5681 skipped: 6dc142b573
  [automerger skipped] [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01 Bug:71860241 skipped: 014165cb84 skipped: a80adf5681
  [automerger skipped] [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01 Bug:71860241 skipped: 014165cb84
  [DO NOT MERGE] Update Security String to 2018-04-01 Bug: 73240847
  [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01 Bug:71860241
 2018-02-14 18:43:37 +00:00
TreeHugger Robot
141ab6f0e6 Merge changes from topics "am-3c619e2a-1f4e-47aa-8753-e1a28443a34e", "am-9f861bb0-3c66-4edc-8d28-54a30e085c78" into nyc-dr1-dev 
* changes:
  [automerger skipped] [DO NOT MERGE] Update Security String to 2018-04-01 Bug: 73240847 skipped: 5b07fbe498 skipped: ab40f0170c skipped: df3319a7fb skipped: ccd891285c skipped: dd276ca966 skipped: 8501efda49
  [automerger skipped] [DO NOT MERGE] Update Security String to 2018-04-01 Bug: 73240847 skipped: 5b07fbe498 skipped: ab40f0170c skipped: df3319a7fb skipped: ccd891285c skipped: dd276ca966
  [automerger skipped] [DO NOT MERGE] Update Security String to 2018-04-01 Bug: 73240847 skipped: 5b07fbe498 skipped: ab40f0170c skipped: df3319a7fb skipped: ccd891285c
  [automerger skipped] [DO NOT MERGE] Update Security String to 2018-04-01 Bug: 73240847 skipped: 5b07fbe498 skipped: ab40f0170c skipped: df3319a7fb
  [automerger skipped] [DO NOT MERGE] Update Security String to 2018-04-01 Bug: 73240847 skipped: 5b07fbe498 skipped: ab40f0170c
  [automerger skipped] [DO NOT MERGE] Update Security String to 2018-04-01 Bug: 73240847 skipped: 5b07fbe498
  [automerger skipped] [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01 Bug:71860241 skipped: 014165cb84 skipped: a80adf5681 skipped: 6dc142b573 skipped: b384901f8e skipped: a359a0a255 skipped: 9108464768
  [automerger skipped] [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01 Bug:71860241 skipped: 014165cb84 skipped: a80adf5681 skipped: 6dc142b573 skipped: b384901f8e skipped: a359a0a255
  [automerger skipped] [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01 Bug:71860241 skipped: 014165cb84 skipped: a80adf5681 skipped: 6dc142b573 skipped: b384901f8e
  [automerger skipped] [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01 Bug:71860241 skipped: 014165cb84 skipped: a80adf5681 skipped: 6dc142b573
  [automerger skipped] [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01 Bug:71860241 skipped: 014165cb84 skipped: a80adf5681
  [automerger skipped] [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01 Bug:71860241 skipped: 014165cb84
  [DO NOT MERGE] Update Security String to 2018-04-01 Bug: 73240847
  [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01 Bug:71860241
 2018-02-14 18:43:37 +00:00
TreeHugger Robot
6d265cda61 Merge changes from topics "am-3c619e2a-1f4e-47aa-8753-e1a28443a34e", "am-9f861bb0-3c66-4edc-8d28-54a30e085c78" into nyc-dev 
* changes:
  [automerger skipped] [DO NOT MERGE] Update Security String to 2018-04-01 Bug: 73240847 skipped: 5b07fbe498 skipped: ab40f0170c skipped: df3319a7fb skipped: ccd891285c skipped: dd276ca966
  [automerger skipped] [DO NOT MERGE] Update Security String to 2018-04-01 Bug: 73240847 skipped: 5b07fbe498 skipped: ab40f0170c skipped: df3319a7fb skipped: ccd891285c
  [automerger skipped] [DO NOT MERGE] Update Security String to 2018-04-01 Bug: 73240847 skipped: 5b07fbe498 skipped: ab40f0170c skipped: df3319a7fb
  [automerger skipped] [DO NOT MERGE] Update Security String to 2018-04-01 Bug: 73240847 skipped: 5b07fbe498 skipped: ab40f0170c
  [automerger skipped] [DO NOT MERGE] Update Security String to 2018-04-01 Bug: 73240847 skipped: 5b07fbe498
  [automerger skipped] [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01 Bug:71860241 skipped: 014165cb84 skipped: a80adf5681 skipped: 6dc142b573 skipped: b384901f8e skipped: a359a0a255
  [automerger skipped] [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01 Bug:71860241 skipped: 014165cb84 skipped: a80adf5681 skipped: 6dc142b573 skipped: b384901f8e
  [automerger skipped] [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01 Bug:71860241 skipped: 014165cb84 skipped: a80adf5681 skipped: 6dc142b573
  [automerger skipped] [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01 Bug:71860241 skipped: 014165cb84 skipped: a80adf5681
  [automerger skipped] [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01 Bug:71860241 skipped: 014165cb84
  [DO NOT MERGE] Update Security String to 2018-04-01 Bug: 73240847
  [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01 Bug:71860241
 2018-02-14 18:43:37 +00:00
Adam Seaton
4a57b9de88 Merge "[DO NOT MERGE] Update Security String to 2018-04-05 in oc-dev Bug:73240847" into oc-dev am: 402397c7f2 
am: 1bdbab9542

Change-Id: If6a0846e43e34127265f2415a94f86cb2d5e53fb
 2018-02-14 00:09:35 +00:00
Adam Seaton
1bdbab9542 Merge "[DO NOT MERGE] Update Security String to 2018-04-05 in oc-dev Bug:73240847" into oc-dev 
am: 402397c7f2

Change-Id: I56dac0e3f017fcdd57e522dccb36ab09cbb15ae2
 2018-02-14 00:05:33 +00:00
TreeHugger Robot
402397c7f2 Merge "[DO NOT MERGE] Update Security String to 2018-04-05 in oc-dev Bug:73240847" into oc-dev 2018-02-13 23:56:08 +00:00