| commit | fb6fb891c736959d3ac339cf239327556513eac3 | [log] [tgz] |
|---|---|---|
| author | Sudheer Shanka <sudheersai@google.com> | Fri May 10 05:00:25 2019 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri May 10 05:00:25 2019 +0000 |
| tree | 86d9a14961d2f24f4a8debe5ae9d97aee7295931 | |
| parent | 0dee848acaf5f56ad1ce40cd8be25022276544c1 [diff] | |
| parent | 3d57a0157f635fe6857bbc2eb42787005f1f4a5e [diff] |
Merge "resolve merge conflicts of 803c05281620fdb74af6d4b6dd8febe5ac079e1d to qt-dev-plus-aosp" into qt-dev-plus-aosp