| commit | e8c2213e674a962de73cc9f3f876180f5d0a4ef2 | [log] [tgz] |
|---|---|---|
| author | Inseob Kim <inseob@google.com> | Fri Aug 23 20:10:20 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Aug 23 20:10:20 2019 -0700 |
| tree | 4898ae48bcd603579ce7056e6f29bc829a913fbe | |
| parent | 7f1d9ac42ef1bf0dc19cb1f561804b9af38c965b [diff] | |
| parent | 7b7a4df45f5324bd00e9440df95371b0968974ad [diff] |
resolve merge conflicts of 94c54dcee6a9728d63cef63c215d3ebd2de83831 to qt-r1-dev-plus-aosp am: 7b7a4df45f Change-Id: Idd8cbfe6b62db9128fc6edbd68158a3002547852