OSDN Git Service

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

Change-Id: I0f19629e2745bcc356374f6394ae339a307e27c4


Trivial merge