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:
e25359b
cbe3d5b
)
Reconcile with ics-mr1-release
author
The Android Open Source Project
<initial-contribution@android.com>
Thu, 15 Dec 2011 00:05:32 +0000
(16:05 -0800)
committer
The Android Open Source Project
<initial-contribution@android.com>
Thu, 15 Dec 2011 00:05:32 +0000
(16:05 -0800)
Change-Id: I1b745b11729a3fda14ffe44f1f44854e087318c7
Trivial merge