OSDN Git Service

am 7fd1af85: am c36fbcdf: am f02f06c4: Merge "camera: check Intent entry count before...
authorEino-Ville Talvala <etalvala@google.com>
Mon, 12 May 2014 17:41:42 +0000 (17:41 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 12 May 2014 17:41:42 +0000 (17:41 +0000)
commit39c852640929d90ae5bcbf49842cbd64bffaa29e
tree82fa3095982ffdcc515f39ea0e6b70fa08ffd937
parent5e4c4f12337ff4d7ceb105bcd441bb7aea6ab070
parent7fd1af85f8fb40f7cb4fcdba98418aeea61fb4f0
am 7fd1af85: am c36fbcdf: am f02f06c4: Merge "camera: check Intent entry count before reading it"

* commit '7fd1af85f8fb40f7cb4fcdba98418aeea61fb4f0':
  camera: check Intent entry count before reading it
services/camera/libcameraservice/api1/client2/Parameters.cpp