commit | 38827a39cc3e897bdb086bb3f2ade507323fb9b5 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Sun Sep 08 15:28:55 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Sun Sep 08 15:28:55 2019 -0700 |
tree | 25262c115ee53a0576886637b8acbe386033a1c6 | |
parent | 81bb23d8524784c2c0a55806af08758d7327bca7 [diff] | |
parent | 1c7a074323e759e44e9f99453d3789dcde4ccd35 [diff] |
[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: f4dcbaeb43 -s ours am: 1c7a074323 -s ours am skip reason: change_id If08aa2717e8ed0a7454a495434e11251f1fb877d with SHA1 8daa88c204 is in history Change-Id: Iefa083a11dc255d385a269e6a1ee73bf03a63815