OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
0165cf4
6faa3ac
)
am 6faa3aca: Merge "Camera2: LEGACY: Support prepare(), sort of." into mnc-dev
author
Eino-Ville Talvala
<etalvala@google.com>
Thu, 30 Apr 2015 18:24:25 +0000
(18:24 +0000)
committer
Android Git Automerger
<android-git-automerger@android.com>
Thu, 30 Apr 2015 18:24:25 +0000
(18:24 +0000)
* commit '
6faa3acaad130533a4d597938fc15b04988a02b2
':
Camera2: LEGACY: Support prepare(), sort of.
Trivial merge