tree 68ac1e33dd41fbb16fef82ff92d437610a7435ac
parent 8ce743f577b2056519fd8e74da272c461ff74e33
parent a06b4e2f2664bdd0b966ed3fb24e560cd9be7124
author Angus Kong <shkong@google.com> 1370306640 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1370306640 +0000

Merge "Add secure camera support." into gb-ub-photos-carlsbad