OSDN Git Service

Merge "Add a flag to indicate if a ScanData is for a scan for all channels" am: c7b84...
authorMitchell Wills <mwills@google.com>
Mon, 12 Sep 2016 21:04:49 +0000 (21:04 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 12 Sep 2016 21:04:49 +0000 (21:04 +0000)
am: d8a5904abe

Change-Id: I92f3dc3aa1f3f110426965ec232e2a8b0b5f068b


Trivial merge