commit | f138b27417eece83396a65ea07142c29e7b955d3 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Thu Aug 15 18:04:24 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Thu Aug 15 18:04:24 2019 -0700 |
tree | 91a89fc8120d8b567fe1d6ff39fc97c35c3cf411 | |
parent | 2064646c23fa53ec3bcb54a1c17c032ccab307ad [diff] | |
parent | 899e4c6455aa30db8a3f7dd36cffd0e9e1d1fda7 [diff] |
[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5713463) into stage-aosp-master am: fa91357ae2 -s ours am: 77ae6ac2b9 am: 899e4c6455 Change-Id: I162c100336bd927e33a83d97ad520566ee0565d1