| commit | 495e55703bb780a17dc0469a9ddd86ba07291daf | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Tue Apr 23 20:29:44 2019 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Apr 23 20:29:44 2019 +0000 |
| tree | b58265c6ac0f2c66a38acbdbd4919610993bc3eb | |
| parent | 955ab994fcd6002b8f323255981c43f7823f350b [diff] | |
| parent | 1df1226927963643dca1df19e49631d051de1acc [diff] |
Merge "resolve merge conflicts of 34cfdfa7137298915be923a8fa6047d4d1b04141 to qt-dev-plus-aosp" into qt-dev-plus-aosp