tree 3294117dd471210f5d5a49bc06be180578738863
parent 683ec675df3cb3cf7cc455f316980dc5418c8ccd
parent c77e5aa3d2286690e76933dbf46653880f637f53
author Daniel Xie <dxie@google.com> 1445987540 +0000
committer android-build-merger <android-build-merger@google.com> 1445987540 +0000

Merge "Add FEATURE_CAMERA_EXTERNAL to front-facing camera condition" into lollipop-mr1-cts-dev am: 98990c5fe4
am: c77e5aa3d2

* commit 'c77e5aa3d2286690e76933dbf46653880f637f53':
  Add FEATURE_CAMERA_EXTERNAL to front-facing camera condition