OSDN Git Service

Merge "Changed Locale in ServiceInfo to a list." am: a1df5b25e6 am: af04c43e3b
authorRobert Greenwalt <rgreenwalt@google.com>
Sat, 10 Jun 2017 00:26:26 +0000 (00:26 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 10 Jun 2017 00:26:26 +0000 (00:26 +0000)
am: 40b0ef4579

Change-Id: I6b40f88b1793b157ec3babcb39caf5d916c6301d


Trivial merge