tree 715373f75bf0fc289924b75576b63cefe1fc37a6
parent 7e6c914119832a6936e3ddd3a0cc9a69873fd883
parent 68a86b448ca7ba613c6e315da9419fd4560b4795
author Steven Moreland <smoreland@google.com> 1476720957 +0000
committer android-build-merger <android-build-merger@google.com> 1476720957 +0000

Merge changes from topic 'nfc-style' am: e397b73792
am: 68a86b448c

Change-Id: Iad4e44eaf060374a047e838360a785ac678f055e