| commit | 21b0f5d00fd5607f131a644ff0889149d072b138 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Thu May 09 17:27:01 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Thu May 09 17:27:01 2019 -0700 |
| tree | 1757f1ed73f0bfb1ddf2ceb100623f1a2b158f87 | |
| parent | e76cd476213214a1d3ca080809ee04fbc208a2b6 [diff] | |
| parent | c0d0e6eb9d3f79708f5601a7f90240b49f7c9b84 [diff] |
[automerger skipped] DO NOT MERGE - Merge Pie Bonito/Sargo into master. am: b18b9788b7 -s ours am: c0d0e6eb9d -s ours am skip reason: subject contains skip directive Change-Id: Ib9e5216d1278126cd8425e63ae387d382cf96d0c