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:
ab5c23b
94083a1
)
Reconcile with ics-mr1-release
author
The Android Open Source Project
<initial-contribution@android.com>
Sat, 3 Mar 2012 00:43:42 +0000
(16:43 -0800)
committer
The Android Open Source Project
<initial-contribution@android.com>
Sat, 3 Mar 2012 00:43:42 +0000
(16:43 -0800)
Change-Id: I8794fd70cb0e38d3c7893b782afdde0acfcffceb
Trivial merge