commit | 44d2c57d19742c12f7d29555c33ab905ce43041c | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Sun Sep 08 14:48:18 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Sun Sep 08 14:48:18 2019 -0700 |
tree | 4c8c511259290e79f03946e1195e016492b1a050 | |
parent | 6c749ccc0961637d77fd095c4bbd87e415694f53 [diff] | |
parent | 7570888e50f44a58575d6cb9e02a7f043c847915 [diff] |
[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 1fe5d0f794 -s ours am: 7570888e50 -s ours am skip reason: change_id I794543699084d787a259098cbe8d4a5c9e204857 with SHA1 da29bd3958 is in history Change-Id: I4e7959479bab61658f9cfe51f11b26d6210c0379