Merge changes from topic 'nfc-style' am: 1d4862a6c2

am: e7476a95f5

Change-Id: I19a9f6db1356b4643c4e340173ef3bdedef9388f
This commit is contained in:
Steven Moreland
2016-10-04 14:39:58 +00:00
committed by android-build-merger

Diff Content Not Available