tree 26c708942000c35a78d4558c941b1822a5eb8b26
parent a07888db26132137ff2623977972805870c5379d
parent 83f87f183c469ed5a8bdfe0922d94d4d8a199746
author Daniel Xie <dxie@google.com> 1445989038 +0000
committer android-build-merger <android-build-merger@google.com> 1445989038 +0000

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

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