OSDN Git Service

Merge changes from topic 'nfc-style'
authorSteven Moreland <smoreland@google.com>
Tue, 4 Oct 2016 14:38:31 +0000 (14:38 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 4 Oct 2016 14:38:31 +0000 (14:38 +0000)
commite7476a95f51b243537a747820ae56a582d44570f
treede2c2cce148bd962230ca2b24b535916cef5480f
parent36108aadd4282743aee9f50683c1a091fe673961
parent1d4862a6c202e5ba0cd8add4d691680c9f1babf1
Merge changes from topic 'nfc-style'
am: 1d4862a6c2

Change-Id: Ic1339a30f4122f3c1abbcc852cbd38a1b750c36c