tree 7c0e0ca66f446f408473068c25b0d459d510ec91
parent 7ee08071ee16a8c9acb02acdc246b046a739b3d7
parent 1847a6c406186246b275e7a6b6f05dcebaf2cbdd
author Martijn Coenen <maco@google.com> 1457686076 +0000
committer android-build-merger <android-build-merger@google.com> 1457686076 +0000

Merge "NFC antenna location asset." into nyc-dev am: 262a8f2a0f
am: 1847a6c406

* commit '1847a6c406186246b275e7a6b6f05dcebaf2cbdd':
  NFC antenna location asset.