| commit | 5d39df803d26915b89fb17613830af149824c8dc | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <android-build-merger@google.com> | Thu Jul 20 11:38:29 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Jul 20 11:38:29 2017 +0000 |
| tree | e80ef3f5a91180c5d73e78a6e71a6de3a4026443 | |
| parent | 90e78fd304cd5fe3a3cd623d7930d4a743472ffe [diff] | |
| parent | 1e0ef00ddc7d2424e2a9d24b5cb9d28cf4fe1075 [diff] |
Merge "Merge "Keyguard: Factor out Screen and Wakefulness lifecycles" into oc-dr1-dev am: d3878b5e12 am: 41234fdc6c" into oc-mr1-dev-plus-aosp