commit | 690e00197cc6df82ab3a972b14f4320c2a28427b | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Thu May 09 21:37:11 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Thu May 09 21:37:11 2019 -0700 |
tree | 6db4f2289d2a2b6a377ee7526041cfa4d3f94040 | |
parent | bbaa99afcf754028894e007fab093bbf0ee7afe9 [diff] | |
parent | 21b0f5d00fd5607f131a644ff0889149d072b138 [diff] |
[automerger skipped] DO NOT MERGE - Merge Pie Bonito/Sargo into master. am: b18b9788b7 -s ours am: c0d0e6eb9d -s ours am: 21b0f5d00f -s ours am skip reason: subject contains skip directive Change-Id: I91db9b1551b9b6bf708ca1bb5c74ee3d2d71434e