commit | fcc74217d1ca737e7e0874a5b46d14005e257898 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Thu Aug 15 18:47:44 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Thu Aug 15 18:47:44 2019 -0700 |
tree | 3b259c11ebeffd15678963ad107273dae64bdae7 | |
parent | 2d7dcf1e71952d287f311a849174169d1dc6cbde [diff] | |
parent | 97dfdf3654a8e8a89a3ce9dc757dfe9c356f7dee [diff] |
[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5713463) into stage-aosp-master am: 5487e82df5 -s ours am: 4117bb8201 am: 263d196387 am: 97dfdf3654 -s ours am skip reason: subject contains skip directive Change-Id: I5e8f5f57c3d4d14fdf54d5c1380a98764d694874