| commit | a9d767b38f3ec0530f3c89d0448225ef9181062c | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Thu May 09 17:19:33 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Thu May 09 17:19:33 2019 -0700 |
| tree | 6a55c98cad11a39418aab4ae5a6ddb4c71186d6d | |
| parent | 90270170724d81013825feeac8f80fd89595388c [diff] | |
| parent | aca632ef301d91a75f4348bdd8957c6899ff4c7e [diff] |
[automerger skipped] DO NOT MERGE - Merge Pie Bonito/Sargo into master. am: 4d0432b5b2 -s ours am: aca632ef30 -s ours am skip reason: subject contains skip directive Change-Id: I44e814975322a4f4423ed6007e956bac48925f9d