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)
commit9688b9b542e87ef1ef7978b78325041a5d9bc051
tree95776a86bdc0e520228f74730addbeb088ca94e6
parent7f13a6029308ebf0675e8ceff6f87e82c7668c56
parent2d7d617e6a64796198a140bea2a496d453bcb275
Merge changes from topic 'bt5-cherry-pickery-2' into oc-dev
am: 2d7d617e6a

Change-Id: I1c71f18c7d2c204fac96c047de3bda7759608997