| commit | 4904e5f06ae0cba1e0947d588879b2014877848f | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Thu May 09 17:11:52 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Thu May 09 17:11:52 2019 -0700 |
| tree | c74a3d34b0434ffc197dd0035c846ddf254e4474 | |
| parent | 774a79492a25767660494856500f90789fa3494e [diff] | |
| parent | 8e7be1faeb2629b5eee560ec1fb68d8dbeb7504d [diff] |
[automerger skipped] Merge "DO NOT MERGE - Merge Pie Bonito/Sargo into master." am: 343a7dcdd2 -s ours am: 8e7be1faeb -s ours am skip reason: subject contains skip directive Change-Id: I3c51185cacadca80cfa183ec16b73426c7b9e936