tree a8fbb69cf4442ee504080a561b627b7b7f7f4a50
parent 4d3f97efda864ca571047edd5239fc8275ea37c4
parent 155e833a7a5fc3e193691324cf9326da1bc3289a
author Nipun Kwatra <nkwatra@google.com> 1283559291 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1283559291 -0700

Merge changes I71f5b0fc,I92c7accb

* changes:
  Moving decision to use still camera to CameraSourceTimeLapse
  pass auxiliary video parameters.