OSDN Git Service

am a11111f9: Merge changes Id28b35fd,Ie4e64977,I2950f31e into klp-dev
authorEino-Ville Talvala <etalvala@google.com>
Fri, 7 Mar 2014 02:00:59 +0000 (02:00 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 7 Mar 2014 02:00:59 +0000 (02:00 +0000)
commit47ef192f0296642b901e82d0c72c5a1a0d08f4df
treec5f4c0f2f679652f37926469de0c180bb1fbd2b5
parentbfc260667e566d4ea29c8b1d089b95ce2c11890c
parenta11111f9135c98cf4247bbd1a61d7df3053e549e
am a11111f9: Merge changes Id28b35fd,Ie4e64977,I2950f31e into klp-dev

* commit 'a11111f9135c98cf4247bbd1a61d7df3053e549e':
  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