| commit | 62b25986bbd5fdca57c11c27768ad9677df7855b | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Sat Apr 06 00:54:16 2019 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Sat Apr 06 00:54:16 2019 +0000 |
| tree | 0956d43b11b8a7f00508bb9e65612fed8454901d | |
| parent | 04fe67bbbd7f5b72cf61140b8229083781464916 [diff] | |
| parent | 874f23e2b9370a06aa07f41c9cdd2d66d151c0c0 [diff] |
Merge "resolve merge conflicts of 07fc302bfbd9b0b192b8d7f43197632643f94b74 to qt-dev-plus-aosp" into qt-dev-plus-aosp