OSDN Git Service

Merge "Merge changes from topic "bt-fix-checkstyle-errors" am: 838ab94a0f am: 8ae5462...
authorJack He <siyuanh@google.com>
Thu, 24 Aug 2017 22:41:41 +0000 (22:41 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 24 Aug 2017 22:41:41 +0000 (22:41 +0000)
am: 450c6035b5

Change-Id: I4ce490de222eb4e76f40e2989473a9ad37f70d7c


Trivial merge