commit | d050cddb4e820c39bfd10db6034e87b371d20c8b | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Tue Jul 02 16:08:45 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Tue Jul 02 16:08:45 2019 -0700 |
tree | 7308633f14ac2871e20d5068975e777af3f50d63 | |
parent | d42be6dc2bd9470d2c7686222246e2677dae00fc [diff] | |
parent | 7182bed81af753fd833f20e1661b72def1c81d02 [diff] |
[automerger skipped] Merge "DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master" into stage-aosp-master am: 26f1b51bfb -s ours am: 4c704ae3ac am: 7182bed81a -s ours am skip reason: subject contains skip directive Change-Id: I34653ea0d5098ffbdd9624c38f2244556f7f4ead