tree 7bad83faf14171f27f122622282f7fc6b6fcaebd
parent 75b97739efe31d3f2533913b053b125fc7334a0b
parent a0025366126e6807bc1a0b6a0b9d37df8877593a
author Daniel Xie <dxie@google.com> 1445988191 +0000
committer android-build-merger <android-build-merger@google.com> 1445988191 +0000

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

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