OSDN Git Service

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

Change-Id: I7477fa88ae9cc83605d2172294bf2ecbcafc567e


Trivial merge