OSDN Git Service

Merge changes Id28b35fd,Ie4e64977,I2950f31e into klp-dev
authorEino-Ville Talvala <etalvala@google.com>
Fri, 7 Mar 2014 01:40:59 +0000 (01:40 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 7 Mar 2014 01:40:59 +0000 (01:40 +0000)
commita11111f9135c98cf4247bbd1a61d7df3053e549e
treee0603972793777c7a190dd2a1c3c76336098a064
parented4d8b28b8ee5a3e4ebc8f73bf4dc86c75a74258
parenta413dd621966044753a8fa1f57c76d847b6f4bec
Merge changes Id28b35fd,Ie4e64977,I2950f31e into klp-dev

* changes:
  DO NOT MERGE: Camera: fix focusArea wrong indexing issue
  DO NOT MERGE: camera2: Fix race with stream deletion during disconnect.
  DO NOT MERGE: camera2/3: Add protection for still capture path