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:
edac451
5ad21fb
)
resolved conflicts for merge of 41829f30 to jb-mr1-dev-plus-aosp
author
Glenn Kasten
<gkasten@google.com>
Tue, 27 Nov 2012 23:05:48 +0000
(15:05 -0800)
committer
Glenn Kasten
<gkasten@google.com>
Tue, 27 Nov 2012 23:06:21 +0000
(15:06 -0800)
Change-Id: I952d333c2e88b6b28663793046a136822d1b6838
Trivial merge