From: Eino-Ville Talvala <etalvala@google.com>
Date: Mon, 12 May 2014 17:41:42 +0000 (+0000)
Subject: am 7fd1af85: am c36fbcdf: am f02f06c4: Merge "camera: check Intent entry count before... 
X-Git-Tag: android-x86-6.0-r1~2149
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=39c852640929d90ae5bcbf49842cbd64bffaa29e;p=android-x86%2Fframeworks-av.git

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
---

39c852640929d90ae5bcbf49842cbd64bffaa29e