OSDN Git Service

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

Change-Id: I64363f953a2877159a14ca90463df91c7ea3d1fc