| commit | f3ba780c48fa244b7201a492cd116a700bb697de | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <noreply-android-build-merger@google.com> | Sat Jul 20 00:33:42 2019 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Sat Jul 20 00:33:42 2019 +0000 |
| tree | 087a5b86892395d21af905c4f56486ead7fd5a79 | |
| parent | bd5f015e35546218f1f765a1506e2e5ce13e9f9a [diff] | |
| parent | 44d05155e5cd67ca11d1c9c573eca9445ba5ddcb [diff] |
Merge "Merge "resolve merge conflicts of 0e680785e4bc502a0237b716378ccb7322c8c1f8 to qt-r1-dev" into qt-r1-dev am: 2a5ac75f63" into qt-r1-dev-plus-aosp