| commit | b20cf71a817e1835a5ea8d084c9896c2aae706d9 | [log] [tgz] |
|---|---|---|
| author | I-Jong Lin <ijonglin@google.com> | Mon Oct 20 23:12:21 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Oct 20 23:12:22 2014 +0000 |
| tree | 38866d01c8155491bcf127235bbc81566d8e703b | |
| parent | 7eeb897bc342f3f0d201464f37d5e6bfa7fe8b37 [diff] | |
| parent | 718c43d79bd080ccacc8eb962637c51811616fda [diff] |
Merge "Secure Camera App survives phone unlock screen" into ub-camera-glacier