tree 0d9c151acac1833360f85e78f9e37b24971ea79c
parent 6986f176da043a5e70f8eb986ea15f52bdc8a3de
parent 85ab1065e30fa46d651b3d64786f17c3743e3a4d
author Rob Barnes <robbarnes@google.com> 1545351064 -0800
committer android-build-merger <android-build-merger@google.com> 1545351064 -0800

Merge "Changed uid output parameter from an int array to a list of strings." am: 4cf3bf237a
am: 85ab1065e3

Change-Id: I00c523bafcbe23b6a3f5024712d6ee3b67f27473