tree f2e750e89a5be6221f8c578b63fd134719654cbf
parent 11a6282bac98cf55a50fca620f5d638d75ac5ec2
parent b20cf71a817e1835a5ea8d084c9896c2aae706d9
author I-Jong Lin <ijonglin@google.com> 1414083729 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414083729 +0000

am b20cf71a: Merge "Secure Camera App survives phone unlock screen" into ub-camera-glacier

* commit 'b20cf71a817e1835a5ea8d084c9896c2aae706d9':
  Secure Camera App survives phone unlock screen