Robert Greenwalt af04c43e3b Merge "Changed Locale in ServiceInfo to a list."
am: a1df5b25e6

Change-Id: I7477fa88ae9cc83605d2172294bf2ecbcafc567e
2017-06-10 00:10:33 +00:00
..
2017-06-08 15:56:38 -07:00