| commit | fdd7f0431b7b15b51d7378c053564fd2cbf472f5 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Mon Jun 08 16:29:28 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Jun 08 16:29:28 2020 +0000 |
| tree | a4b8afbef6137f0f0c5f188ba7b641ac5d11d0a7 | |
| parent | 135f8a1297472f31c546259d006f8f0f1b1f62d8 [diff] | |
| parent | 5254fe477b03947168b8e9ae8fdba928fa5e8f55 [diff] |
[automerger skipped] Merge QQ3A.200605.002 into master am: c3e97676d6 -s ours am: 2f8ad89e7a -s ours am: 5254fe477b -s ours am skip reason: Change-Id I64135373d30eb0b3fff00857c0909130bd0891f9 with SHA-1 ad4ea2a098 is in history Original change: https://android-review.googlesource.com/c/platform/hardware/nxp/nfc/+/1323223 Change-Id: I364bf3a4f01dee593e18a7f43cd71e6cbdbe266c