| commit | 2a5ac75f63ab6e4634a7e27fc528d819adc16d6a | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Fri Jul 19 23:47:35 2019 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Jul 19 23:47:35 2019 +0000 |
| tree | 97429462716087a6f3bde9408f153fd963577efd | |
| parent | 68d625bea614f45a18251c72f26d1170ed36c92c [diff] | |
| parent | 3486cf4d0b0ab40f8e1a26a7c314c485f098f906 [diff] |
Merge "resolve merge conflicts of 0e680785e4bc502a0237b716378ccb7322c8c1f8 to qt-r1-dev" into qt-r1-dev