tree 8ba3fdaf3189ebfce5f5c0d428e239b3e452c7c4
parent 905c50a21238aa1de38989f1f9169cf40ebe02d5
parent bdb5ac7ddbabec0ba947a32937d8b95738d513dc
author Adam Powell <adamp@google.com> 1381887681 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1381887682 +0000

Merge "Fix dodgy states of keyguard transport controls" into klp-dev