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)
commitd4bee349fa3b7a3fd98662bff1fc02a25c844614
tree0d184dfe2cf85833046e532a4a419c06b5f8bb62
parenta436aeb3dd8369f48af885156ca36f60ea2cbc1b
parent187e0108ff92ca9263887a8b7f0d44131bf0b7be
Merge changes from topic 'bt5-cherry-pickery-1' into oc-dev
am: 187e0108ff

Change-Id: Ifdc2e36e39923744681777144ba696de348375fa