commit | 2ddefaa8eab91a4d0940758d789b445ffc89bdda | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Mon Jun 08 15:56:40 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Jun 08 15:56:40 2020 +0000 |
tree | 6b63e4540820ca92710f5e1ee304273bed3a053c | |
parent | cc28b4329f235cef245b76c95a038009e0444d79 [diff] | |
parent | 93879fac991ca320f267b0ecb768cb0ff1e2b4c4 [diff] |
[automerger skipped] Merge "Merge QQ3A.200605.002 into master" am: 93879fac99 -s ours am skip reason: Change-Id Ifd6ed878ab1907a2e5be444cf6b7bfbfc96d3e99 with SHA-1 cc28b4329f is in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Nfc/+/1323635 Change-Id: I682ec7803e50c51677159dbbf29a44fcf9a5a94d