| commit | 5e2c282ac195052e8fb7845d5e40f491b83032a7 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Thu May 09 16:01:06 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Thu May 09 16:01:06 2019 -0700 |
| tree | f292941c1e64dd68a34ddf68314fba2ce09da706 | |
| parent | b56ec379142e1f5dfe494a858c79c149d0277870 [diff] | |
| parent | bafb1705ac94a73840f12ab9a36e26ea12495d78 [diff] |
[automerger skipped] DO NOT MERGE - Merge Pie Bonito/Sargo into master. am: bafb1705ac -s ours am skip reason: subject contains skip directive Change-Id: I5931eb9234788094441df6acb27bcda226423dfa