OSDN Git Service

Merge changes from topic 'bt5_scan_props' am: 1e73f14e77 am: de6a7cbd2a
authorJakub Pawlowski <jpawlowski@google.com>
Tue, 7 Feb 2017 01:38:28 +0000 (01:38 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 7 Feb 2017 01:38:28 +0000 (01:38 +0000)
am: be28cca74e

Change-Id: I0af6abaa511cb43ea84c5f40fb4480f2ebe639e7


Trivial merge