tree ab1a4ef3617cd9b5e94049972c21fde9701c36aa
parent 9d4d53746f91f1fb4e7bc349832cdba817a0fffd
parent 23ae50885f28790cd016ae05dc9cbf6a61c6a2e5
author Rob Barnes <robbarnes@google.com> 1545351675 -0800
committer android-build-merger <android-build-merger@google.com> 1545351675 -0800

Merge "Changed uid output parameter from an int array to a list of strings." am: 7eae0132c1 am: 4718f665d4
am: 23ae50885f

Change-Id: Ieefd1262586a3fbcf13999193c1e058abf1e0a8e