tree 9d5010ea8e68501e023e8dfe4fc4f7c69c582073
parent 344d7305fef2689858aa75038e2382684e871f6a
parent 41093f860c88767dde469af87f141999c4b660f5
author Daniel Xie <dxie@google.com> 1445989722 +0000
committer android-build-merger <android-build-merger@google.com> 1445989722 +0000

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

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