tree d350f0d69a14397033b52d1db942c0dc67d0091f
parent faa0192826063d40eef2cd997b1649c78cb639b0
parent 69e510d6f7a06a9784a0d4eb24b2757a33d39873
author Adrian Roos <roosa@google.com> 1405593388 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1405555794 +0000

Merge "Partially fix the keyguard scrim" into lmp-dev