OSDN Git Service

(root) / android-x86 / frameworks-av.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cf79c7a c36fbcd)
am c36fbcdf: am f02f06c4: Merge "camera: check Intent entry count before reading it"
authorEino-Ville Talvala <etalvala@google.com>
Mon, 12 May 2014 17:36:42 +0000 (17:36 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 12 May 2014 17:36:42 +0000 (17:36 +0000)
* commit 'c36fbcdf37ec02314e7b8134bb0de5f624fa70fd':
  camera: check Intent entry count before reading it


Trivial merge
frameworks/av
About OSDN
Find Software
Develop Software
Help