| commit | 1e2265e701a07d71a3c64d2645684d0499c876ab | [log] [tgz] |
|---|---|---|
| author | Orion Hodson <oth@google.com> | Thu Jun 25 09:05:40 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jun 25 09:05:40 2020 +0000 |
| tree | e64d084692612902a9d5911289d103d062b5c5de | |
| parent | 519fe68a2d3f94c1a6cdbdee9c749c8f5e2cd5f4 [diff] | |
| parent | b0a2dc98e861a8f143676f6bee4f5aae6603e7d2 [diff] |
[automerger skipped] Merge "Update to use nativehelper/JNIPlatformHelp.h" am: 8acfb83967 am: 3f6df73c31 -s ours am: 958dfee796 -s ours am: f41229342e -s ours am: b0a2dc98e8 -s ours am skip reason: Change-Id Id580d7af98d47e84c4491d0471fd09636d0e68b8 with SHA-1 0c302f34b7 is in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Nfc/+/1348862 Change-Id: Iac91619cbdf902db3388ff3e8fae70ae8f404e7a