| commit | f9f63f8693734f9d6b51ebec50f33fa3fbc5ef72 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Thu Aug 15 18:46:43 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Aug 15 18:46:43 2019 -0700 |
| tree | f05b513d1063c22024852aefc41217f0ea9bc81c | |
| parent | 0862a7e26c9b8895a743c413bdb44a0d52fe4593 [diff] | |
| parent | c1c6dcfe2c2f268512f66e0f192808ad7ae537a1 [diff] |
[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5713463) into stage-aosp-master am: ac01b8191f -s ours am: 18bc9d0d61 am: 8ae5cddaec am: c1c6dcfe2c -s ours am skip reason: subject contains skip directive Change-Id: I17be40e1ba9f4726d3c93fa039753bebd5f5d6ad