tree 35a16905ca4f620fe7b7cd84c7db729c6b779d58
parent 7a4b1f97e0cc395aa423d56b48b2957d8f4fd486
parent 473c226256243fb96f21964f3f7e2cccf9da6b9f
author Daniel Xie <dxie@google.com> 1445986479 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1445986479 +0000

Merge "DO NOT MERGE: Add FEATURE_CAMERA_EXTERNAL to front-facing camera condition" into marshmallow-cts-dev