tree f0cc576905eb58c6dad1cdcec901b3ca25cc5456
parent 5b64aa689f22fd72107db26a7ba42654599144e4
parent cd925885283396c0379ec2dcaa94e318993f40f8
author Eino-Ville Talvala <etalvala@google.com> 1381629030 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1381629030 +0000

Merge "DO NOT MERGE: Hide new camera API." into klp-dev