| commit | f330446b1f33e461644dc04f173c372633dd1313 | [log] [tgz] |
|---|---|---|
| author | Inseob Kim <inseob@google.com> | Thu Aug 22 15:03:16 2019 +0900 |
| committer | Inseob Kim <inseob@google.com> | Thu Aug 22 07:26:43 2019 +0000 |
| tree | 1e54620dd15c819d5e94879836a7075a15c7d79c | |
| parent | 3770a20278507ef8da4b52c5f93e25c9df8bf28f [diff] | |
| parent | 06821a09128ea6f2e9dd607d9db9bd653836888e [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: Ica19c67957831670f2e8ee39befe2ebecdc08ea6 Merged-In: I40780d770d0e55fa3c164a5b39911a47c1145284