| commit | 9995c58c91a95ebc30cb497985fdcc9da418f992 | [log] [tgz] |
|---|---|---|
| author | Inseob Kim <inseob@google.com> | Fri Aug 23 20:47:23 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Aug 23 20:47:23 2019 -0700 |
| tree | 10d858da0a75235e7f91d20790e68793c6311bdd | |
| parent | 899017c3a229e9e4e0621a583cdb90775888bbb7 [diff] | |
| parent | e8c2213e674a962de73cc9f3f876180f5d0a4ef2 [diff] |
[automerger skipped] resolve merge conflicts of 94c54dcee6a9728d63cef63c215d3ebd2de83831 to qt-r1-dev-plus-aosp am: 7b7a4df45f am: e8c2213e67 -s ours am skip reason: change_id Ie4bd35eb87d384dd51e0a562c68dfa820d9bea7b with SHA1 442679b0a0 is in history Change-Id: Ibe0b402c2308ec5cbf5ddb12898d6de9d233fcdd