tree b93d610e465cfac63e17245e166e5b19ca765882
parent 86873be315bcc8e3aceb66e41825bacba85a112f
parent 0b094277076286d100cf1da6860b7038be662ce9
author Yin-Chia Yeh <yinchiayeh@google.com> 1461706470 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1461706470 +0000

Merge "DO NOT MERGE: Camera: override external facing for API1 client"