tree f8f26f50dec19d36e608c1910fb5b14dd48e3294
parent 08847c83448558fbe2dfb8290d2ba119f9c0be18
parent a06905b8f716ceaccd9244bc2e58777a7d770488
author Adrian Roos <roosa@google.com> 1401731287 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1401731287 +0000

Merge "Fix keyguard camera logic" into lmp-preview-dev