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:
44959ef
91741bc
)
Reconcile with ics-mr1-release
author
The Android Open Source Project
<initial-contribution@android.com>
Wed, 1 Feb 2012 16:42:59 +0000
(08:42 -0800)
committer
The Android Open Source Project
<initial-contribution@android.com>
Wed, 1 Feb 2012 16:42:59 +0000
(08:42 -0800)
Change-Id: Ia38fac8a91adbce6ae5c796c86252ac2364e3a6f
Trivial merge