OSDN Git Service

Merge "Roaming Enhancement API" am: ab920d2460 am: 9fc8d06e2f -s ours
authorRandy Pan <zpan@google.com>
Tue, 13 Dec 2016 19:44:59 +0000 (19:44 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Dec 2016 19:44:59 +0000 (19:44 +0000)
am: 45420947af  -s ours

Change-Id: Ib89b7dcacb39920d204a9eeb91a5e629ad63c79e


Trivial merge