tree 3da9d0e9b6231fb814faab465d2823a58abc1585
parent 67624094c9949fca3b6b8ac69e73c9ce654515a3
parent eac8a05d19d0c29f8e4310db62d5ed41bc4773b9
author Makoto Onuki <omakoto@google.com> 1525190465 -0700
committer android-build-merger <android-build-merger@google.com> 1525190465 -0700

Merge "Propagate calling UID to AM from LauncherApps" into pi-dev
am: eac8a05d19

Change-Id: I0c9bfeb58bd51954f9ec11944ad20e996e1caa8f