commit | 485a31132e02583cd212d1fdea63d230bfd8cccd | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Sun Sep 08 16:22:12 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Sun Sep 08 16:22:12 2019 -0700 |
tree | 83471e5f6424f9a88c0609c8ca62445ce7ee5f0e | |
parent | 5d6df3687feeb42da5075412a2ecacaa6896c87c [diff] | |
parent | 9cc49c4661909cab14ba97d5f32f3269fccb6e7a [diff] |
[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: df9a7ab05a -s ours am: 9cc49c4661 -s ours am skip reason: change_id I29b3e3131804fcbc215e0adcbc5dc9cc0a77d220 with SHA1 0b0a9471f7 is in history Change-Id: Ibb24b60d86a6ae8e35315b59e26d4d369b2a83b6