| commit | e0aedc2e744cb983dd2a3373d8bd114a4e1061f3 | [log] [tgz] |
|---|---|---|
| author | Adrian Salido <salidoa@google.com> | Mon Sep 09 16:15:58 2019 -0700 |
| committer | Adrian Salido <salidoa@google.com> | Tue Sep 10 01:07:02 2019 +0000 |
| tree | af2230311e0f0e0c8424402d76519f3aac7331da | |
| parent | b419fa8686633b112b3fa153e29528cb8821ee6c [diff] | |
| parent | d916d941d89ec8fdcbc2bbe0bfdf0b0db1ad08b5 [diff] |
resolve merge conflicts of d916d941d89ec8fdcbc2bbe0bfdf0b0db1ad08b5 to qt-qpr1-dev Test: I solemnly swear I tested this conflict resolution. Bug: 139557239 Change-Id: I4966f630b0e980e17cbbbcf9b280e034eaeb651e Merged-In: Ia85a60fde55afaed5106462942e0bb77652ec737