tree e135c1b3d58add36b434da29e31d2b87a9701d4b
parent 16c9546d3929952dcb9addf4ecbc0f7d7d4b95f7
parent c8134552bc45c6829f832c8b3d134228af5091a4
author Robert Greenwalt <rgreenwalt@google.com> 1497053036 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1497053038 +0000

Merge "Changed ServiceInfo.Locale to a List"