OSDN Git Service

Merge "NFC: Add Annotations to the HAL file" am: 3bca1eef75
authorRuchi Kandoi <kandoiruchi@google.com>
Mon, 21 Nov 2016 23:06:57 +0000 (23:06 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 21 Nov 2016 23:06:57 +0000 (23:06 +0000)
am: 3007940bda

Change-Id: I34838be329867495cce6108472fa94ef09285c02


Trivial merge