tree e137b377a2c6e87798171ee107636ebfc1263686
parent 6604af68c5606a64ec103c973e5dea43e52817a7
parent 271617af8300fcc481e83070d0ed874ac5b89692
author Bryce Lee <brycelee@google.com> 1521227516 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1521227516 +0000

Merge "Do not sleep activities in focused stack when keyguard is going away" into pi-dev