tree 1bbd881b1301acbf57280148ed2a781b6242196b
parent 69a5f6c3e04aa0f3f87eed7578a32782c97bd48f
parent db97f60054b6011fbcc1baf29a68b940b53046c0
author Mike Lockwood <lockwood@android.com> 1314983051 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1314983051 -0700

Merge "Fix logic for power button overridding the "wait for prox negative state" after a call"