commit | ed2e1871d26ed1eda832f0af8b3fc9d7bdd003ad | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Wed Sep 11 11:16:21 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Wed Sep 11 11:16:21 2019 -0700 |
tree | bc9b3c02ad3344f036ab6118688ea3224d3f9719 | |
parent | a989068e0b51e3f7f4bd9deb34ac97ef6b5d3c1f [diff] | |
parent | 3722d4710e15a880943abc1e98fc1de73323f0f1 [diff] |
[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 367167e081 -s ours am: 104801bbfa -s ours am: 3722d4710e -s ours am skip reason: change_id I4d381d4cd3be0c07b80afd00af3e46a34aa5fc89 with SHA1 379286bc6d is in history Change-Id: I1fc5d2a7d31764897567fee0b6008cdd948c4fd3