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:
0981b25
5b03a1a
)
Reconcile with ics-mr1-release
author
The Android Open Source Project
<initial-contribution@android.com>
Sat, 7 Jan 2012 02:15:13 +0000
(18:15 -0800)
committer
The Android Open Source Project
<initial-contribution@android.com>
Sat, 7 Jan 2012 02:15:14 +0000
(18:15 -0800)
Change-Id: Id0aeb30eb75c6c4aee7abbc9877aa5b16389778c
Trivial merge