OSDN Git Service
(root)
/
android-x86
/
frameworks-av.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
cf79c7a
c36fbcd
)
am c36fbcdf: am f02f06c4: Merge "camera: check Intent entry count before reading it"
author
Eino-Ville Talvala
<etalvala@google.com>
Mon, 12 May 2014 17:36:42 +0000
(17:36 +0000)
committer
Android 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