OSDN Git Service

Merge "DO NOT MERGE ANYWHERE Remove incorrect assert in btm_read_rssi_cb" into cw...
authorAndre Eisenbach <eisenbach@google.com>
Tue, 30 May 2017 21:14:55 +0000 (21:14 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 30 May 2017 21:14:55 +0000 (21:14 +0000)
am: 1917615840  -s ours

Change-Id: I91ce7e6383929bec27e0acc2d9544e6478495f22


Trivial merge