tree bf5964ea61cfc26ffeb0e1070114de03e07a6314
parent c2c751613916e5c708e7f505f48139d963792085
parent a27b004ca034a6ef86191952f118285909f84ff9
author Jorim Jaggi <jjaggi@google.com> 1402774837 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1402543850 +0000

Merge "Revert "Introduced fading views for the camera interaction on the lockscreen."" into lmp-preview-dev