| commit | fdba62be3cf8dec7b1430bd623c115942be04585 | [log] [tgz] |
|---|---|---|
| author | Inseob Kim <inseob@google.com> | Thu Aug 22 14:57:21 2019 +0900 |
| committer | Inseob Kim <inseob@google.com> | Thu Aug 22 07:28:52 2019 +0000 |
| tree | 3bd8a685c7f8fc30db01ec680f5a5a4add5fd23c | |
| parent | 50694e9fb722a4d4f5e5f1795b98b96113aac265 [diff] | |
| parent | 94c54dcee6a9728d63cef63c215d3ebd2de83831 [diff] |
resolve merge conflicts of 94c54dcee6a9728d63cef63c215d3ebd2de83831 to qt-r1-dev-plus-aosp Bug: None Test: I solemnly swear I tested this conflict resolution. Change-Id: Ifd302c6ebba81c6d79e74b28ff26ec7c07c1322e Merged-In: I7812db716ca42055caa70385c71a90de49fc1afc Merged-In: Ib285432d66fbe9ca99d94edb41b424937f04b26d