| commit | a805c84fe809ebc43e1990cb5713fde40bb4aaa9 | [log] [tgz] |
|---|---|---|
| author | Youming Ye <paulye@google.com> | Tue Apr 23 18:35:03 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Apr 23 18:35:03 2019 -0700 |
| tree | b28c944899ca62848616959035ed6ab71aa0f5f0 | |
| parent | 2899c1b2a9de6a386eb2edbd2da372e643177728 [diff] | |
| parent | 495e55703bb780a17dc0469a9ddd86ba07291daf [diff] |
Merge "resolve merge conflicts of 34cfdfa7137298915be923a8fa6047d4d1b04141 to qt-dev-plus-aosp" into qt-dev-plus-aosp am: 495e55703b Change-Id: I5a5b62e693f75ffcabfe51b8f5a67b35bd168b5c