| commit | b6aa0e4aaaa503c5f34a8049fadfb8d75b04d173 | [log] [tgz] |
|---|---|---|
| author | Ruchi Kandoi <kandoiruchi@google.com> | Wed Jun 12 21:37:27 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Jun 12 21:37:27 2019 -0700 |
| tree | 48b818d78befa52dfc0ef09aadaf88c6b6a07935 | |
| parent | 272dfed902c79d38722689a1bed0a8890b25fd67 [diff] | |
| parent | 96203430d3cacb922f12defe6ea70b9e90290ac9 [diff] |
[automerger skipped] Merge "Update Secure NFC API definitions" am: 6b6b3322fc am: 78a96339ee -s ours am: 96203430d3 -s ours am skip reason: change_id If78d90fdc0a24d5f44bbb582f388a9c60b12786c with SHA1 2d09e5c41f is in history Change-Id: I81831fe81c82cca7a06e5c200d269a71b022e7c0