| commit | c22db3e73abb40135339a55a9331955c9133a12c | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Wed Sep 11 14:50:48 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Sep 11 14:50:48 2019 -0700 |
| tree | 25a91af75cc4a08af402f46104340a175095885e | |
| parent | a3b9c46f01c90bafc1a2a6374ed44477bba3b180 [diff] | |
| parent | 9b2f502e0a6e71e01a0558c02f0972c3af87b5a1 [diff] |
[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: d57e959e71 -s ours am: 9b2f502e0a -s ours am skip reason: change_id I1f2564837c33cd4c6c3db6aac3cbaf8c09707da9 with SHA1 ebf0ccf2dc is in history Change-Id: I4926fbce88d1245645276e34bbaaf96d185a3d32