| commit | aef82a68ef5767ab16b954b221a6dfcc2946d369 | [log] [tgz] |
|---|---|---|
| author | Adrian Salido <salidoa@google.com> | Tue Sep 10 08:54:23 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Sep 10 08:54:23 2019 -0700 |
| tree | d818365e6235c6f0a6b35d55f00ea17629699f68 | |
| parent | 4fd64a357bfebf1c62cf226c6c769ff9109c162a [diff] | |
| parent | 10544ab13b1ed3560c7ef0ee6f0e84b25cff6b77 [diff] |
[automerger skipped] resolve merge conflicts of d916d941d89ec8fdcbc2bbe0bfdf0b0db1ad08b5 to qt-qpr1-dev am: e0aedc2e74 -s ours am: 10544ab13b -s ours am skip reason: change_id Ia85a60fde55afaed5106462942e0bb77652ec737 with SHA1 0f0ddc1055 is in history Change-Id: I38a82395c2b48e4172fcd3b87bfec89ee97d14c8