OSDN Git Service

Merge changes from topic 'bt5-cherry-pickery-1' into oc-dev
authorJakub Pawlowski <jpawlowski@google.com>
Sat, 1 Apr 2017 15:57:39 +0000 (15:57 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 1 Apr 2017 15:57:39 +0000 (15:57 +0000)
am: 187e0108ff

Change-Id: Ifdc2e36e39923744681777144ba696de348375fa


Trivial merge