Commit Graph

37127 Commits

Author SHA1 Message Date
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
TreeHugger Robot 656fd837e9 Merge "[DO NOT MERGE]Update Security String to 2018-04-01 in oc-dev Bug:73240847" into oc-dev 2018-02-13 23:35:05 +00:00
TreeHugger Robot 0d66f2b854 Merge changes from topic "am-ddd6c5a0-3aa8-4d6c-a3b8-0460c103683f" into oc-dev
* changes:
  [automerger] [DO NOT MERGE] Update security string to 2018-04-01 in nyc-dev Bug: 73240847 am: b20e43bfbd am: e5018177a2 am: 9a781cc784 am: 82043e682d skipped: 6206e9c2c4
  [automerger] [DO NOT MERGE] Update security string to 2018-04-01 in nyc-dev Bug: 73240847 am: b20e43bfbd am: e5018177a2 am: 9a781cc784 am: 82043e682d
  [automerger] [DO NOT MERGE] Update security string to 2018-04-01 in nyc-dev Bug: 73240847 am: b20e43bfbd am: e5018177a2 am: 9a781cc784
  [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
Adam Seaton 312d7e7a3c [DO NOT MERGE] Update Security String to 2018-04-05 in oc-dev
Bug:73240847
2018-02-13 21:40:38 +00:00
Adam Seaton accee92300 [DO NOT MERGE]Update Security String to 2018-04-01 in oc-dev
Bug:73240847
2018-02-13 21:14:31 +00:00
Android Build Merger (Role) 2f29431ff1 [automerger] [DO NOT MERGE] Update security string to 2018-04-01 in nyc-dev Bug: 73240847 am: b20e43bfbd am: e5018177a2 am: 9a781cc784 am: 82043e682d skipped: 6206e9c2c4
Change-Id: I961e46ab627fee8e5e7903c9a450290e9d46f512
2018-02-12 19:50:06 +00:00
Android Build Merger (Role) 6206e9c2c4 [automerger] [DO NOT MERGE] Update security string to 2018-04-01 in nyc-dev Bug: 73240847 am: b20e43bfbd am: e5018177a2 am: 9a781cc784 am: 82043e682d
Change-Id: Ia2faa5f1d7a1ba430061c06b03df6963a31f2bbf
2018-02-12 19:50:02 +00:00
Android Build Merger (Role) 82043e682d [automerger] [DO NOT MERGE] Update security string to 2018-04-01 in nyc-dev Bug: 73240847 am: b20e43bfbd am: e5018177a2 am: 9a781cc784
Change-Id: Iae6372d78a915688f577eb37c8294ea6b0c14a76
2018-02-12 19:50:00 +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) b0aa7c342a [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 am: 00a67ddab1 am: 2afc690751 skipped: 49f77737a2
Change-Id: I45b510b29678883a6d89fd63960df9df4c84f9f5
2018-02-12 19:29:30 +00:00
Android Build Merger (Role) 49f77737a2 [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 am: 00a67ddab1 am: 2afc690751
Change-Id: I41804bc2f8485c6b89708a3a7e82cb8f49fd37be
2018-02-12 19:29:27 +00:00
Android Build Merger (Role) 2afc690751 [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 am: 00a67ddab1
Change-Id: I5bda5bccef672c7e713545801701481163d81734
2018-02-12 19:29:23 +00: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
Sen Jiang 2d9cfe30f8 Merge "Specify --max_timestamp when calling brillo_update_payload." into nyc-dev am: 258f04a556 -s ours am: 478e5c3ff4 -s ours am: 2b7db24048 -s ours am: 289910cb63 -s ours
am: 52eb6cbd46  -s ours

Change-Id: I1ce0c175236164eef49b9dc593e53c6e2ef34190
2018-01-13 00:45:04 +00:00
Tao Bao 9da9c4c001 Specify --max_timestamp when calling brillo_update_payload. am: d364541fb9 -s ours am: c12bdb2ed5 -s ours am: 0f3e3ddf2c -s ours am: 4008f976e7 -s ours
am: 1fe2869558  -s ours

Change-Id: I584bde943007b3cf6f00fe15bcd3a71fc8bb3025
2018-01-13 00:42:53 +00:00
Sen Jiang 52eb6cbd46 Merge "Specify --max_timestamp when calling brillo_update_payload." into nyc-dev am: 258f04a556 -s ours am: 478e5c3ff4 -s ours am: 2b7db24048 -s ours
am: 289910cb63  -s ours

Change-Id: I75be57c830552182f5f8a8c61acf78d7b58c7848
2018-01-13 00:38:18 +00:00
Tao Bao 1fe2869558 Specify --max_timestamp when calling brillo_update_payload. am: d364541fb9 -s ours am: c12bdb2ed5 -s ours am: 0f3e3ddf2c -s ours
am: 4008f976e7  -s ours

Change-Id: Ibd8a6c14c8b5b3e97051be748be0ea5417ca88f5
2018-01-13 00:37:15 +00:00
Sen Jiang 289910cb63 Merge "Specify --max_timestamp when calling brillo_update_payload." into nyc-dev am: 258f04a556 -s ours am: 478e5c3ff4 -s ours
am: 2b7db24048  -s ours

Change-Id: I4d8de9226362558034be3a166d4a2331827e0c1a
2018-01-13 00:33:45 +00:00
Tao Bao 4008f976e7 Specify --max_timestamp when calling brillo_update_payload. am: d364541fb9 -s ours am: c12bdb2ed5 -s ours
am: 0f3e3ddf2c  -s ours

Change-Id: I40cb316c9fb2de355a1b5f35b43cfb10a3748515
2018-01-13 00:32:42 +00: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 ca09e189e9 Merge "Specify --max_timestamp when calling brillo_update_payload." into nyc-dr1-dev am: 21a26c9843 am: 64e3da49be am: ed62f299b5
am: ea43cfbea1  -s ours

Change-Id: Iab2f6f021ff2269475898c6bb362fb67518bf59d
2018-01-12 22:30:20 +00:00
Sen Jiang ea43cfbea1 Merge "Specify --max_timestamp when calling brillo_update_payload." into nyc-dr1-dev am: 21a26c9843 am: 64e3da49be
am: ed62f299b5

Change-Id: I88c06fb665f834a006b381bc0a2eb02e6303a690
2018-01-12 22:23:21 +00:00
Sen Jiang ed62f299b5 Merge "Specify --max_timestamp when calling brillo_update_payload." into nyc-dr1-dev am: 21a26c9843
am: 64e3da49be

Change-Id: Ic2e9ff1ec09f81a6fc960663c4e3bca397d7784e
2018-01-12 22:19:08 +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
Sen Jiang 4378910f30 Merge "Specify --max_timestamp when calling brillo_update_payload." into oc-dev 2018-01-12 20:55:22 +00:00
Elisa Pascual Trevino 44861dc6dd [DO NOT MERGE] Update security string to 2018-03-05 for oc-dev
Bug:71860241
2018-01-12 17:38:16 +00:00
TreeHugger Robot 48539e0ff6 Merge "[DO NOT MERGE] Update security string to 2018-03-01 for oc-dev Bug:71860241" into oc-dev 2018-01-12 01:33:33 +00:00
Elisa Pascual Trevino b75e95f40a Merge "[DO NOT MERGE] Update security string to 2018-03-01 for nyc-dev Bug:71860241" into nyc-dev am: c3aee02b03 am: 4ab30bc502 am: f113fe294c am: 5a53ba3eb3
am: 82b90c8110  -s ours

Change-Id: I3090e3011e91d75c1f0d99762037b06e9f82e34a
2018-01-12 00:52:46 +00:00
Elisa Pascual Trevino 82b90c8110 Merge "[DO NOT MERGE] Update security string to 2018-03-01 for nyc-dev Bug:71860241" into nyc-dev am: c3aee02b03 am: 4ab30bc502 am: f113fe294c
am: 5a53ba3eb3

Change-Id: I86650749707258d7b440a09f284fc5fcc8e05c32
2018-01-12 00:47:02 +00:00
Elisa Pascual Trevino 5a53ba3eb3 Merge "[DO NOT MERGE] Update security string to 2018-03-01 for nyc-dev Bug:71860241" into nyc-dev am: c3aee02b03 am: 4ab30bc502
am: f113fe294c

Change-Id: I620835e63f499c8e1b8260b5b1414f84d3286eba
2018-01-12 00:40:01 +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 587ec653f1 [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 am: a1c02ac99e am: 2daf3f586c
am: ba60cad7ab  -s ours

Change-Id: I8c98113547529e4db2146eaa682e829ee0ac9fd2
2018-01-12 00:11:34 +00:00
Elisa Pascual Trevino ba60cad7ab [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 am: a1c02ac99e
am: 2daf3f586c

Change-Id: I35d9356b70e92b50385a879e54576a244574dd1d
2018-01-12 00:09:57 +00:00
Elisa Pascual Trevino 2daf3f586c [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
am: a1c02ac99e

Change-Id: Ic6f9e8e25a106a49986683e8f23f641d0cc749f5
2018-01-12 00:07:13 +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