OSDN Git Service

Merge changes from topic 'nfc-style' am: e397b73792
authorSteven Moreland <smoreland@google.com>
Mon, 17 Oct 2016 16:15:57 +0000 (16:15 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 17 Oct 2016 16:15:57 +0000 (16:15 +0000)
commit2bbecd660702354e4a3db1251f2897c8dcea32d7
tree715373f75bf0fc289924b75576b63cefe1fc37a6
parent7e6c914119832a6936e3ddd3a0cc9a69873fd883
parent68a86b448ca7ba613c6e315da9419fd4560b4795
Merge changes from topic 'nfc-style' am: e397b73792
am: 68a86b448c

Change-Id: Iad4e44eaf060374a047e838360a785ac678f055e