| commit | c17acb4504281f674d4912222d37226b1a04bccd | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Thu May 09 20:18:40 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Thu May 09 20:18:40 2019 -0700 |
| tree | 35b718a043cf4325bbf04f4b737af1868b234eb5 | |
| parent | eb61e2da6309e9bd95f7e748bbf94adae383814b [diff] | |
| parent | 61db4bf787b2e81356ed364473a6be57a6a0aedb [diff] |
[automerger skipped] Merge "DO NOT MERGE - Merge Pie Bonito/Sargo into master." am: 61db4bf787 -s ours am skip reason: subject contains skip directive Change-Id: I236c440692d3a9729297f8ed762a30c8c6d9ed61