OSDN Git Service

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

Change-Id: I5fb2897cb5456f92ea4da17d333f091f2f2c1e42