OSDN Git Service

Merge changes from topic 'bt5-cherry-pickery-2' into oc-dev
authorJakub Pawlowski <jpawlowski@google.com>
Tue, 11 Apr 2017 20:01:46 +0000 (20:01 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 11 Apr 2017 20:01:46 +0000 (20:01 +0000)
am: 2d7d617e6a

Change-Id: I1c71f18c7d2c204fac96c047de3bda7759608997


Trivial merge