commit | c8622732d8ab612ffe3dd6ffd027c28b6d416826 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Sun Sep 08 17:33:31 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Sun Sep 08 17:33:31 2019 -0700 |
tree | 99a6f20963d7d89d8fd066d42841932fd0a0f7e9 | |
parent | 7df389704104d82f564bd3346807c506e3227628 [diff] | |
parent | d1f953fad87aea9741a9b7eeae27601ced86b4f4 [diff] |
[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 260cab7892 -s ours am: 1b06528325 -s ours am: d1f953fad8 -s ours am skip reason: change_id I38429ee13989d447b1350d9f098d22786c2e9447 with SHA1 3343873fa1 is in history Change-Id: I45ce7f338e7b43ab807b8dc94084d91afe56c41a