tree 9e015cc8d4a2197a369d4a9c320ca5cabdef1ab7
parent ce0c63a05ff779753b54b23a09ac6724d64cab71
parent cc6d4f138145d79f4314eb6488a065a6c0ff0fa9
author Jizhou Liao <Jizhou.Liao@nxp.com> 1463122703 +0000
committer android-build-merger <android-build-merger@google.com> 1463122703 +0000

Merge "Fix warnings in external/libnfc-nci/src."
am: cc6d4f1381

* commit 'cc6d4f138145d79f4314eb6488a065a6c0ff0fa9':
  Fix warnings in external/libnfc-nci/src.

Change-Id: I1d43fdcd9a5982fe81ef350c8f7adae7003905b1