tree 715373f75bf0fc289924b75576b63cefe1fc37a6
parent 3447c4687a32ca1afd2f61ef05fa281c89fe0d3f
parent e397b73792d06492b52896f46b06fab6d1c00f03
author Steven Moreland <smoreland@google.com> 1476720606 +0000
committer android-build-merger <android-build-merger@google.com> 1476720606 +0000

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

Change-Id: I7227c4bc4746aef1f64421132070dfce94d1a7c6