commit | 4fe1809bc16e7eb29a4a43988302c652b683a59a | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Wed Sep 11 14:50:26 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Wed Sep 11 14:50:26 2019 -0700 |
tree | 68478634546ee81413da2cea4136895125eb94f0 | |
parent | 629ae7676b6ee35831ddcd25a303de48159a1999 [diff] | |
parent | 366954c3d9f8ec9db6b1d1e850395c7e0a43daa8 [diff] |
[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 087bf32be2 -s ours am: 366954c3d9 -s ours am skip reason: change_id I20eda906f06b84b148b1b94439e8092d65ea6b4c with SHA1 5c35f40326 is in history Change-Id: Ie6ef4cb1113bbdcb93e1ce7f1d1f39b2242d49ea