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:
c26ce0c
bd026f3
)
Reconcile with ics-mr1-release
author
The Android Open Source Project
<initial-contribution@android.com>
Thu, 1 Mar 2012 18:11:47 +0000
(10:11 -0800)
committer
The Android Open Source Project
<initial-contribution@android.com>
Thu, 1 Mar 2012 18:11:48 +0000
(10:11 -0800)
Change-Id: I0dd6896813e61ae5168134d6018dc96bd41008e8
Trivial merge