tree a593f7c62bcbef923513dc5303d176d085e11dcd
parent 9772b610bd30cfa4d98882a2fe345c7650823991
parent e3c3c87822ff806ee048be15d9b6710f9eac9eb0
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