tree 8d3729f49ff45b7ecbb685e0ce3c32d80f63db00
parent fa7a3bbe83fec0c9c013ef11b36e3d3ecfe7f43b
parent 4f01d03ed54837fe53ede48b51099e38ff556766
author Chenjie Yu <cjyu@google.com> 1524073136 -0700
committer android-build-merger <android-build-merger@google.com> 1524073136 -0700

Merge "Fix merge isolated uid to host uid" into pi-dev am: 2abcea2b8a
am: 4f01d03ed5

Change-Id: I52bdd03ceca9169942b00edbdd05f99cb45da092