tree 77a026569353649679276371ec1b112084e011c5
parent 57d49697471c96b696ec1982fce397537d99ca08
parent e9bbd4152dc1e8b43ddaeedf219a778d4f4354ec
author Hidehiko Abe <hidehiko@google.com> 1525879198 -0700
committer android-build-merger <android-build-merger@google.com> 1525879198 -0700

Cherry-pick UID/GID mapping support. am: f240b14514
am: e9bbd4152d

Change-Id: I4c1a948a0939c7aae467b60f4e5197bdd12ece00