| commit | 7b7a4df45f5324bd00e9440df95371b0968974ad | [log] [tgz] |
|---|---|---|
| author | Inseob Kim <inseob@google.com> | Thu Aug 22 15:02:44 2019 +0900 |
| committer | Inseob Kim <inseob@google.com> | Thu Aug 22 07:27:17 2019 +0000 |
| tree | 4898ae48bcd603579ce7056e6f29bc829a913fbe | |
| parent | a5c90680862c950e185b4d223770ffb5f386d73a [diff] | |
| parent | 3abdf524f9e372f6bdd7836e8303406f42e13b9e [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: I48b4a8f0e2c3b2bd263250032349338cb21b17bb Merged-In: Ie4bd35eb87d384dd51e0a562c68dfa820d9bea7b