| commit | dcdd150e6c5d9c6df10b7bc49612c879d1808f6d | [log] [tgz] |
|---|---|---|
| author | Adrian Roos <roosa@google.com> | Mon Jun 02 17:52:56 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 02 17:52:56 2014 +0000 |
| tree | a7109c9ecd340916e7bdbb4f77b65fb40f45a838 | |
| parent | 57f285d3ab50571a8008666da9c8bac4c43eb303 [diff] | |
| parent | e205192c722e4fa1b37ee1b31dced21cf89ffbb4 [diff] |
am 2726d500: Merge "Fix keyguard camera logic" into lmp-preview-dev * commit '2726d500c4e6ae63dbc4ee3b070cd2f6ba008602': Fix keyguard camera logic