Commit Graph

29703 Commits

Author SHA1 Message Date
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 a49d2d49d3 Merge changes from topic "am-ddd6c5a0-3aa8-4d6c-a3b8-0460c103683f" into nyc-mr1-dev
* changes:
  [automerger] [DO NOT MERGE] Update security string to 2018-04-01 in nyc-dev Bug: 73240847 am: b20e43bfbd am: e5018177a2
  [automerger] [DO NOT MERGE] Update security string to 2018-04-01 in nyc-dev Bug: 73240847 am: b20e43bfbd
  [DO NOT MERGE] Update security string to 2018-04-01 in nyc-dev Bug: 73240847
2018-02-13 22:48:46 +00:00
Android Build Merger (Role) 9a781cc784 [automerger] [DO NOT MERGE] Update security string to 2018-04-01 in nyc-dev Bug: 73240847 am: b20e43bfbd am: e5018177a2
Change-Id: I28ba8487cfb46b4887d42baaf8d14ada2b258d0c
2018-02-12 19:49:57 +00:00
Android Build Merger (Role) e5018177a2 [automerger] [DO NOT MERGE] Update security string to 2018-04-01 in nyc-dev Bug: 73240847 am: b20e43bfbd
Change-Id: I9ace6376f11131672f1f900a60d5737e4a74bc21
2018-02-12 19:49:42 +00:00
Adam Seaton b20e43bfbd [DO NOT MERGE] Update security string to 2018-04-01 in nyc-dev
Bug: 73240847
2018-02-12 11:48:08 -08:00
Android Build Merger (Role) 00a67ddab1 [automerger] [DO NOT MERGE] Update Security String to 2018-04-01 on mnc-dev Bug:73240847 am: e4d86d9b06 am: 83709d3152 am: 70ea788dfa skipped: ac14372129 am: 83c448128c am: 50abbfdb53
Change-Id: I3afc37971e979b561cd4ead55a7f04d456526600
2018-02-12 19:29:20 +00:00
Android Build Merger (Role) 50abbfdb53 [automerger] [DO NOT MERGE] Update Security String to 2018-04-01 on mnc-dev Bug:73240847 am: e4d86d9b06 am: 83709d3152 am: 70ea788dfa skipped: ac14372129 am: 83c448128c
Change-Id: I2bd8d8265cf136682fa5faba753979ad6ff2dda8
2018-02-12 19:29:17 +00:00
Android Build Merger (Role) 83c448128c [automerger] [DO NOT MERGE] Update Security String to 2018-04-01 on mnc-dev Bug:73240847 am: e4d86d9b06 am: 83709d3152 am: 70ea788dfa skipped: ac14372129
Change-Id: I47eefa3ba40b22e9f03a510bb6f03b04f0d18aef
2018-02-12 19:29:13 +00:00
Android Build Merger (Role) ac14372129 [automerger] [DO NOT MERGE] Update Security String to 2018-04-01 on mnc-dev Bug:73240847 am: e4d86d9b06 am: 83709d3152 am: 70ea788dfa
Change-Id: Ia9c78b05a58e5dddd2e90a6bf53b638ddbccecf1
2018-02-12 19:29:10 +00:00
Android Build Merger (Role) 70ea788dfa [automerger] [DO NOT MERGE] Update Security String to 2018-04-01 on mnc-dev Bug:73240847 am: e4d86d9b06 am: 83709d3152
Change-Id: I970dd7c49833638b34d415ee962b60a13d382c0c
2018-02-12 19:29:07 +00:00
Android Build Merger (Role) 83709d3152 [automerger] [DO NOT MERGE] Update Security String to 2018-04-01 on mnc-dev Bug:73240847 am: e4d86d9b06
Change-Id: I8dd3706df6cb68d4e7c7dc47bb218e3bc0e5afec
2018-02-12 19:29:03 +00:00
Adam Seaton e4d86d9b06 [DO NOT MERGE] Update Security String to 2018-04-01 on mnc-dev
Bug:73240847
2018-02-12 11:27:35 -08:00
Android Build Merger (Role) 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
Change-Id: Ib27162e4084213ff9b19a647b4c9cf0ab693dd40
2018-02-12 19:18:00 +00:00
Android Build Merger (Role) 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
Change-Id: Ia1823874bf668652495bdde1f9142ef50f0519fd
2018-02-12 19:17:57 +00:00
Android Build Merger (Role) 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
Change-Id: I946b3f1523f613c3a5e8008ccac78cd7672184ce
2018-02-12 19:17:52 +00:00
Android Build Merger (Role) dd276ca966 [automerger skipped] [DO NOT MERGE] Update Security String to 2018-04-01 Bug: 73240847 skipped: 5b07fbe498 skipped: ab40f0170c skipped: df3319a7fb skipped: ccd891285c
Change-Id: I8a60ed0ab627fb6dda498e7d2f9993769651c5e3
2018-02-12 19:17:48 +00:00
Android Build Merger (Role) ccd891285c [automerger skipped] [DO NOT MERGE] Update Security String to 2018-04-01 Bug: 73240847 skipped: 5b07fbe498 skipped: ab40f0170c skipped: df3319a7fb
Change-Id: I47bb8aef3b52eaaf5c99b4d28dc127c5a3970490
2018-02-12 19:17:45 +00:00
Android Build Merger (Role) df3319a7fb [automerger skipped] [DO NOT MERGE] Update Security String to 2018-04-01 Bug: 73240847 skipped: 5b07fbe498 skipped: ab40f0170c
Change-Id: If919c336906d3b426e4f57551271ccea457d333b
2018-02-12 19:17:42 +00:00
Android Build Merger (Role) ab40f0170c [automerger skipped] [DO NOT MERGE] Update Security String to 2018-04-01 Bug: 73240847 skipped: 5b07fbe498
Change-Id: Id14db714c9b92ff497ba7021118cc0a501db33c9
2018-02-12 19:17:38 +00:00
Android Build Merger (Role) 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
Change-Id: Ie690734a8144dc500ea8bbe297618e5368f48fbb
2018-02-12 19:15:32 +00:00
Android Build Merger (Role) 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
Change-Id: Id935910b2c5fc6ecd9d53ea75cbf5e9307b81452
2018-02-12 19:15:28 +00:00
Android Build Merger (Role) 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
Change-Id: Id91b8e4bf24a9627392e7cf5e26415706c7f343e
2018-02-12 19:15:25 +00:00
Android Build Merger (Role) a359a0a255 [automerger skipped] [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01 Bug:71860241 skipped: 014165cb84 skipped: a80adf5681 skipped: 6dc142b573 skipped: b384901f8e
Change-Id: Ibd4f622162fd6a8cf1f0399e4a8f722e525bd8d2
2018-02-12 19:15:22 +00:00
Android Build Merger (Role) b384901f8e [automerger skipped] [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01 Bug:71860241 skipped: 014165cb84 skipped: a80adf5681 skipped: 6dc142b573
Change-Id: Ic640071f2f87944fc64772e8a5ef686cd09a1f35
2018-02-12 19:15:19 +00:00
Android Build Merger (Role) 6dc142b573 [automerger skipped] [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01 Bug:71860241 skipped: 014165cb84 skipped: a80adf5681
Change-Id: Ib108c0d99a369ef98e89a06124d5f811c9dd1c62
2018-02-12 19:15:16 +00:00
Android Build Merger (Role) a80adf5681 [automerger skipped] [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01 Bug:71860241 skipped: 014165cb84
Change-Id: I12ddd6c70fba413b84014875f1a9cad09f5868ba
2018-02-12 19:15:12 +00:00
Adam Seaton 5b07fbe498 [DO NOT MERGE] Update Security String to 2018-04-01
Bug: 73240847
2018-02-12 11:11:07 -08:00
Adam Seaton 014165cb84 [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01
Bug:71860241
2018-02-12 11:09:13 -08:00
Sen Jiang 2b7db24048 Merge "Specify --max_timestamp when calling brillo_update_payload." into nyc-dev am: 258f04a556 -s ours
am: 478e5c3ff4  -s ours

Change-Id: I8eca7a11900777034f094d5e102734f43afc89f2
2018-01-13 00:26:56 +00:00
Tao Bao 0f3e3ddf2c Specify --max_timestamp when calling brillo_update_payload. am: d364541fb9 -s ours
am: c12bdb2ed5  -s ours

Change-Id: I6aa0704e7d54fb07cf2a36e8966a4b8cd50a6b2f
2018-01-13 00:25:27 +00:00
Sen Jiang 478e5c3ff4 Merge "Specify --max_timestamp when calling brillo_update_payload." into nyc-dev
am: 258f04a556  -s ours

Change-Id: Id22475574e2ad723c4ebfb79c9b6e727db41f2d8
2018-01-13 00:23:34 +00:00
Tao Bao c12bdb2ed5 Specify --max_timestamp when calling brillo_update_payload.
am: d364541fb9  -s ours

Change-Id: Ibb6acae4edbaa8202de795ce0b0a54b7cff54bbd
2018-01-13 00:19:23 +00:00
Sen Jiang 258f04a556 Merge "Specify --max_timestamp when calling brillo_update_payload." into nyc-dev 2018-01-13 00:13:58 +00:00
Sen Jiang 64e3da49be Merge "Specify --max_timestamp when calling brillo_update_payload." into nyc-dr1-dev
am: 21a26c9843

Change-Id: I656c817338e6b1921213478cdb4f98923561487e
2018-01-12 22:14:30 +00:00
Sen Jiang 21a26c9843 Merge "Specify --max_timestamp when calling brillo_update_payload." into nyc-dr1-dev 2018-01-12 22:03:43 +00:00
Elisa Pascual Trevino f113fe294c Merge "[DO NOT MERGE] Update security string to 2018-03-01 for nyc-dev Bug:71860241" into nyc-dev am: c3aee02b03
am: 4ab30bc502

Change-Id: I5c38e422102517f52e0aacfabbf63918cd9de7a5
2018-01-12 00:31:38 +00:00
Elisa Pascual Trevino 4ab30bc502 Merge "[DO NOT MERGE] Update security string to 2018-03-01 for nyc-dev Bug:71860241" into nyc-dev
am: c3aee02b03

Change-Id: I2db4d77ae94e11c304cbbe74557e5c6f42c8a6cd
2018-01-12 00:26:24 +00:00
TreeHugger Robot c3aee02b03 Merge "[DO NOT MERGE] Update security string to 2018-03-01 for nyc-dev Bug:71860241" into nyc-dev 2018-01-12 00:19:37 +00:00
Elisa Pascual Trevino a1c02ac99e [DO NOT MERGE] Update security string to 2018-03-01 for mnc-dev Bug:71860241 am: fa4234e1df am: a615903311 am: 81e61008ed am: 51e7d3a175 -s ours am: cd6054fa86
am: 6619c472f3

Change-Id: I23f4290b7f7cdbc30ea9b36530421b9a14a50d26
2018-01-12 00:03:48 +00:00
Elisa Pascual Trevino 6619c472f3 [DO NOT MERGE] Update security string to 2018-03-01 for mnc-dev Bug:71860241 am: fa4234e1df am: a615903311 am: 81e61008ed am: 51e7d3a175 -s ours
am: cd6054fa86

Change-Id: I2bfc125bbc7cf0f23c90b82d4b739d66b8de24b8
2018-01-11 23:57:20 +00:00
Elisa Pascual Trevino cd6054fa86 [DO NOT MERGE] Update security string to 2018-03-01 for mnc-dev Bug:71860241 am: fa4234e1df am: a615903311 am: 81e61008ed
am: 51e7d3a175  -s ours

Change-Id: Ie369373e406d1bda3c3fe19497b49bcaf2cffccd
2018-01-11 23:54:59 +00:00
Elisa Pascual Trevino 51e7d3a175 [DO NOT MERGE] Update security string to 2018-03-01 for mnc-dev Bug:71860241 am: fa4234e1df am: a615903311
am: 81e61008ed

Change-Id: I2822ff9851b4c6981168979ed80e6a8ae5ad255a
2018-01-11 23:49:37 +00:00
Elisa Pascual Trevino 81e61008ed [DO NOT MERGE] Update security string to 2018-03-01 for mnc-dev Bug:71860241 am: fa4234e1df
am: a615903311

Change-Id: I93a3d87c3410fbf38ce60a6c8d56570c8d75fe9e
2018-01-11 23:47:03 +00:00
Elisa Pascual Trevino a615903311 [DO NOT MERGE] Update security string to 2018-03-01 for mnc-dev Bug:71860241
am: fa4234e1df

Change-Id: I73be513192a58a2467ab00ae1b1a4c0c00e9c712
2018-01-11 23:43:31 +00:00
Elisa Pascual Trevino d20489e397 [DO NOT MERGE] Update security string to 2018-03-01 for nyc-dev
Bug:71860241
2018-01-11 22:58:39 +00:00
Elisa Pascual Trevino fa4234e1df [DO NOT MERGE] Update security string to 2018-03-01 for mnc-dev
Bug:71860241
2018-01-11 22:46:05 +00:00
Adam Seaton 81f33be96c [DO NOT MERGE] Update security string to 2018-02-01 for lmp-mr1-dev bug:70348883 am: fedac8dbc2 -s ours am: b22c56332f am: d572ee7efa am: a67af52d8c am: a645938f45 -s ours am: 229da9d2f2
am: 590a4d3c6a

Change-Id: Ifeb9761f78989eaf144d8b66a9325d24ab73aac1
2017-12-14 00:24:09 +00:00
Adam Seaton ca5b4e7969 [DO NOT MERGE] Update security string to 2018-02-01 for mnc-dev bug:70348883 am: 74f105c16f am: 6545915c0b am: 567d926508 am: 06602d3239 -s ours am: 3980822dff
am: 5d59b6650b

Change-Id: I4ff20889f9e42cc1520844aacc11cab3bdcf0fd0
2017-12-14 00:22:42 +00:00
Adam Seaton 590a4d3c6a [DO NOT MERGE] Update security string to 2018-02-01 for lmp-mr1-dev bug:70348883 am: fedac8dbc2 -s ours am: b22c56332f am: d572ee7efa am: a67af52d8c am: a645938f45 -s ours
am: 229da9d2f2

Change-Id: I0de04527cf31be0d497beab0ef87bda41048a549
2017-12-14 00:20:38 +00:00
Adam Seaton 5d59b6650b [DO NOT MERGE] Update security string to 2018-02-01 for mnc-dev bug:70348883 am: 74f105c16f am: 6545915c0b am: 567d926508 am: 06602d3239 -s ours
am: 3980822dff

Change-Id: I80365112878b90cdd62979372cfe275d3e22eaa8
2017-12-14 00:19:32 +00:00