tree d9880e55ca951c7e9566a26e65d8082ee0fade10
parent fe0c8f2aaf972cdc24a4bdca25e3d859b8f40d1f
parent 658da1e24ba71acd82405b23afd7929fa1f11229
author Daniel Xie <dxie@google.com> 1445986447 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1445986447 +0000

Merge "Add FEATURE_CAMERA_EXTERNAL to front-facing camera condition" into lollipop-mr1-cts-dev