| commit | 84f4a8077845ba374716c41e83ad5df485953493 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Tue Jul 02 12:50:09 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Jul 02 12:50:09 2019 -0700 |
| tree | 1f2e57c92604850a2352915e5cd07e242730be73 | |
| parent | b0a08e391b5354005b5174ac524f6bb21a0f7831 [diff] | |
| parent | 0df7046c1aabcf35b4f8042ebeae83f6f6d1ce07 [diff] |
[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master am: e4aaef8c13 -s ours am: 6070b98796 am: 0df7046c1a -s ours am skip reason: subject contains skip directive Change-Id: I91d454e0c55eca8f5cf153a3e5bef32d2babfd62