tree 0a8d5124a81c3c90cc0993202cfd98ff8ed2483c
parent 1bf3b364a95de923836af98fab7e0e5d640b90ed
parent ba8d3d6109293558e24cf9422229b6951680e4ad
author Vishnu Nair <vishnun@google.com> 1541800338 -0800
committer android-build-merger <android-build-merger@google.com> 1541800338 -0800

[automerger skipped] Merge "[DO NOT MERGE] AM: Fix invalid hot launch app metrics seen with quickstep" into pi-dev am: bdba80d907
am: ba8d3d6109  -s ours

Change-Id: I0f0c5ea20aac2b3f1bf529679fa63eff81673531