tree 636453f1b082bf8a2ff65755b40923750092b01a
parent 5f40d8347638a767d81d2d6f711323969ec05357
parent 40b0ef45792bb09d7d7674486cb534509eef27e1
author Robert Greenwalt <rgreenwalt@google.com> 1497054386 +0000
committer android-build-merger <android-build-merger@google.com> 1497054386 +0000

Merge "Changed Locale in ServiceInfo to a list." am: a1df5b25e6 am: af04c43e3b
am: 40b0ef4579

Change-Id: I6b40f88b1793b157ec3babcb39caf5d916c6301d