| commit | 423038f73ef823a6003b92c2193203e12efd6025 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Sun Sep 08 15:27:11 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Sun Sep 08 15:27:11 2019 -0700 |
| tree | 630e76424b806d77259ce7ba5e446c806dc8f010 | |
| parent | 1577bed88e593fa82883e3fc02b1a1a3df975cf8 [diff] | |
| parent | 97d59b7500ed1af2394a7e1ce507fa21a5707223 [diff] |
[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: a7d36a4257 -s ours am: 97d59b7500 -s ours am skip reason: change_id I64a01331273216829533f69f4422036e5598a547 with SHA1 c12771af1e is in history Change-Id: Ie4b6c46ce7d9ea732fde3e87b8c3e545c88ab8ab