commit | 447b3ef06011a0b6d2111993bc1c7d59472559c0 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Sun Sep 08 16:02:16 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Sun Sep 08 16:02:16 2019 -0700 |
tree | 6a2051445cc6646463d9f939b83b86086f3a14ed | |
parent | 5f6e445228708e8e76170e15492a2749619869a7 [diff] | |
parent | e72851a196123f8549b2a48c8d0dbd5cfb1d1336 [diff] |
[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 05ff4e26d9 -s ours am: e72851a196 -s ours am skip reason: change_id I93faa55bf6fca544876d970d058f8aa5c5462f3c with SHA1 555d150aee is in history Change-Id: I36885a04c5350b9835ecd79d99b14e374fbedbd8