OSDN Git Service

Merge "Revert "Hide power dialog when lockscreen comes and goes."" into oc-dr1-dev
authorAlison Cichowlas <asc@google.com>
Wed, 28 Jun 2017 19:12:50 +0000 (19:12 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 28 Jun 2017 19:12:50 +0000 (19:12 +0000)
commit22f0dfcff53abeb59153ceb287879f3dcaed1141
treeab004605409b8d117be60ee43f1fbff3fd66023f
parentb02863eba61fecfe94a0ae89d1a52b8ac9437788
parentbc9e65fc51b81070127324226b679b588461e9fa
Merge "Revert "Hide power dialog when lockscreen comes and goes."" into oc-dr1-dev
services/core/java/com/android/server/am/ActivityManagerService.java