OSDN Git Service

Merge changes from topic 'ble-scan-accounting'
authorJakub Pawlowski <jpawlowski@google.com>
Tue, 23 Aug 2016 21:51:39 +0000 (21:51 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 23 Aug 2016 21:51:39 +0000 (21:51 +0000)
am: 725d2dac7b  -s ours

Change-Id: Ic992092816435f0b1b24c762abd06722e32b7c58


Trivial merge