OSDN Git Service

Merge "Add NFC Transaction Event intent actions and extras" am: 337e2feada
authorRuchi Kandoi <kandoiruchi@google.com>
Fri, 2 Feb 2018 22:13:27 +0000 (22:13 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 2 Feb 2018 22:13:27 +0000 (22:13 +0000)
commit9750a6f69a7cfc764675df8f33a4dc9c6ac44293
tree5548e087751bb092bf06f9d6510f887425d3865a
parentc8cb3aad586a84e511f60c603c18f9dce9d4bf1c
parent8b35111d3e763ffe12e0b0301af5be40cf3b29ac
Merge "Add NFC Transaction Event intent actions and extras" am: 337e2feada
am: 8b35111d3e

Change-Id: Icedc6764b7b3fdf9b5706bedc3e4fe0dc0d39c58