OSDN Git Service

Fix crashes in btm_consolidate_dev am: bd8ed367d3
authorJakub Pawlowski <jpawlowski@google.com>
Tue, 22 Aug 2017 21:03:49 +0000 (21:03 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 21:03:49 +0000 (21:03 +0000)
am: 94357d4888

Change-Id: Ie6f8837f84571cf9bcdbb25ce2df35a47df73828


Trivial merge