| commit | 5b42503b660ba20b07da47cbdd45adfb434680ef | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Thu May 09 15:58:35 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Thu May 09 15:58:35 2019 -0700 |
| tree | 86572917c18244f76bda58a0753e52c957164227 | |
| parent | 58685f02a2c25f461fc2506b8df1c0f3e13570fa [diff] | |
| parent | 2494de82e3ffc2ef114524365cc53d07c48ffd4e [diff] |
[automerger skipped] DO NOT MERGE - Merge Pie Bonito/Sargo into master. am: 2494de82e3 -s ours am skip reason: subject contains skip directive Change-Id: Ic939cf267f1b11302ae342d447b240e9d41c5f51