tree d99a14c3371da070dad652393b2d06594647b512
parent 11dc74e1e1adff138cd1b728fd919819d51814a1
parent d973441f3de6052615a5c1c4336de833a83273b4
author Leo Hsu <leohsu@google.com> 1551161621 -0800
committer android-build-merger <android-build-merger@google.com> 1551161621 -0800

Merge "Enable shortcut view only if it's launched from power menu." am: 044bfd7c99 am: c6549267fe
am: d973441f3d

Change-Id: Ic12e31ded9846e930acbb01e81583fd733669f54