OSDN Git Service
(root)
/
android-x86
/
frameworks-av.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
a7cbd8e
7382d6a
)
Reconcile with ics-mr1-release
author
The Android Open Source Project
<initial-contribution@android.com>
Thu, 12 Jan 2012 16:56:17 +0000
(08:56 -0800)
committer
The Android Open Source Project
<initial-contribution@android.com>
Thu, 12 Jan 2012 16:56:17 +0000
(08:56 -0800)
Change-Id: Ie242914fa4cfdf35675bbd2777f0817186860526
Trivial merge