OSDN Git Service

Merge "Nfc: deal with the framework going away." am: 26d788b376 am: 74f327f970
authorMartijn Coenen <maco@google.com>
Thu, 23 Feb 2017 20:51:28 +0000 (20:51 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 23 Feb 2017 20:51:28 +0000 (20:51 +0000)
am: df902938ec

Change-Id: I8fe69cb9e23756029e42facbc7c21b41c2148a4b


Trivial merge