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:
a10f9b0
5dd0a57
)
am 5d7b2778: resolved conflicts for merge of 41829f30 to jb-mr1-dev-plus-aosp
author
Glenn Kasten
<gkasten@google.com>
Wed, 28 Nov 2012 02:43:32 +0000
(18:43 -0800)
committer
Android Git Automerger
<android-git-automerger@android.com>
Wed, 28 Nov 2012 02:43:32 +0000
(18:43 -0800)
* commit '
5d7b2778d0e9849fa601d722ec2efcee7d032d4f
':
New VHQ resampler
Trivial merge