OSDN Git Service
(root)
/
android-x86
/
frameworks-native.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
92ce52a
bdfa931
)
resolved conflicts for merge of 6a828712 to master
author
Adam Powell
<adamp@google.com>
Wed, 7 Dec 2011 00:40:49 +0000
(16:40 -0800)
committer
Adam Powell
<adamp@google.com>
Wed, 7 Dec 2011 00:53:47 +0000
(16:53 -0800)
Change-Id: I73c804667a890bcc9924951ff655137c1345541a
Trivial merge