commit | 13237019e43d4fca7eb33a197e3bbc8696073657 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Mon Jun 08 16:07:54 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Jun 08 16:07:54 2020 +0000 |
tree | a95e69450fb035d381a01caa53ed7cbac92f137d | |
parent | 018ce27b06306007dd6511e3ddac07fbdae6fea3 [diff] | |
parent | 2ddefaa8eab91a4d0940758d789b445ffc89bdda [diff] |
[automerger skipped] Merge "Merge QQ3A.200605.002 into master" am: 93879fac99 -s ours am: 2ddefaa8ea -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: I4070759b59eda60fcf0a0734f74c3fdea756dfe4