| commit | ca23b0171492b6b8db80836682afac24aa4efa1d | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Thu May 09 15:56:19 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Thu May 09 15:56:19 2019 -0700 |
| tree | ead2464966b249bd7cc4393e0ee6511b573c394a | |
| parent | 015f800edf7dbaf57307b63be8aa61fd5d7d69bb [diff] | |
| parent | 2a49c8de07422e0c01e162ae322687f8b838b452 [diff] |
[automerger skipped] DO NOT MERGE - Merge Pie Bonito/Sargo into master. am: 2a49c8de07 -s ours am skip reason: subject contains skip directive Change-Id: Ib109cf35cae4b70ac762f9f3d4951968cfa91e9e