tree 4ddfa90a840a5bd3f4d49b1f022a3c74cb22f250
parent 61d7cd460c24b71406864fc41409f44964cdbc09
parent be8d1cf1ac9fc514fb0cc2e8ef4a85beb0197fa0
author Jim Miller <jaggies@google.com> 1312506363 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1312506363 -0700

Merge "Fix 5045008: replace "ring/silence" target in LockScreen with camera app"