tree 59567fad777afb231be0766fcc0e734454cd86d1
parent 6e85e8ece8582d20bff26d629fff5684a686d5f0
parent 3f1c2382c962cfa053dc3ebdc35160797f215ef6
author android-build-team Robot <android-build-team-robot@google.com> 1525463907 -0700
committer android-build-merger <android-build-merger@google.com> 1525463907 -0700

Merge "Propagate calling UID to AM from CrossProfileApps" into pi-dev am: 7bfb942e2d
am: 3f1c2382c9

Change-Id: If002ec36dfa98c5699b5f6270eb60e22b1dffa87