OSDN Git Service

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

Change-Id: I1e5a734e4acd5c37d41dcb8d792538d17c6b8b84


Trivial merge