commit | 5d4c54f570ade0fba3a063730b0bff00ff3f0ed5 | [log] [tgz] |
---|---|---|
author | Android Build Merger (Role) <android-build-merger@google.com> | Tue Jun 14 18:33:08 2016 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Jun 14 18:33:10 2016 +0000 |
tree | f08f3620919bc429fff82c51ce89a5efb5ec5dc2 | |
parent | df30e75294b16fd3a9ad03d783802cc72f73a1f5 [diff] | |
parent | 22822b7ad8cd1e5575d709ccc1015b323030eb9f [diff] |
Merge "Merge \\"Don\\'t take the DPMS lock in DPMI.createPackageSuspendedDialogIntent\\" into nyc-dev am: 5e94a16b74 am: e220722bdf" into nyc-mr1-dev-plus-aosp