| commit | 5247a0403d34bca692136a35de1928f66781b158 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Thu May 09 21:48:08 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Thu May 09 21:48:08 2019 -0700 |
| tree | 2665c8d8acf7455978b53d990f455a615d6d4631 | |
| parent | 4bb25bf30980dce90207b999055f8a0c4161a658 [diff] | |
| parent | 5646a3e4b76f4b0eff1e7d4f82923cc8fc092533 [diff] |
[automerger skipped] Merge "DO NOT MERGE - Merge Pie Bonito/Sargo into master." am: 732c740bcc -s ours am: 5646a3e4b7 -s ours am skip reason: subject contains skip directive Change-Id: Ifa7502ef90d267415d3a444f5df30427fff7c90e