OSDN Git Service

Merge changes from topic 'wifitracker' into oc-dev
authorSundeep Ghuman <sghuman@google.com>
Wed, 26 Apr 2017 18:45:00 +0000 (18:45 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 26 Apr 2017 18:45:00 +0000 (18:45 +0000)
am: b57b3dfc3e

Change-Id: I98df76a59575e2814b39c0afa2e725c6b5622e17


Trivial merge