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)
am: 8b35111d3e

Change-Id: Icedc6764b7b3fdf9b5706bedc3e4fe0dc0d39c58


Trivial merge