tree 4601c569762c82f88a3dc01fea79c8b1e58778a8
parent 92354a5b3149c0086c3fb413618fb28a083a27fb
parent 0663b001439b339b8dece76e68df7fbafd0d44dd
author Ruchi Kandoi <kandoiruchi@google.com> 1479769948 +0000
committer android-build-merger <android-build-merger@google.com> 1479769948 +0000

Merge "NFC: Add Annotations to the HAL file" am: 3bca1eef75 am: 3007940bda am: 2c54eef738
am: 0663b00143

Change-Id: I1e5a734e4acd5c37d41dcb8d792538d17c6b8b84