| commit | c2dfd7c10af79f7328d6804a483d0e7b03b77fe3 | [log] [tgz] |
|---|---|---|
| author | Youming Ye <paulye@google.com> | Wed Jun 05 17:59:03 2019 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Jun 05 17:59:03 2019 +0000 |
| tree | dab92f5676c0b0eeaa994eb663fcec5ca1368b2c | |
| parent | 397d0b924d70182d58a9e1cdc03ab22fff5e4a19 [diff] | |
| parent | 9fc0374e5cc767d8b30be2f2372837b841ec4a1f [diff] |
Merge "resolve merge conflicts of 235072ad0968d03af274d54254240e63999c5619 to qt-dev-plus-aosp" into qt-dev-plus-aosp