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:
1da7ad1
0de434f
)
Reconcile with ics-mr1-release
author
The Android Open Source Project
<initial-contribution@android.com>
Fri, 9 Dec 2011 15:11:09 +0000
(07:11 -0800)
committer
The Android Open Source Project
<initial-contribution@android.com>
Fri, 9 Dec 2011 15:11:10 +0000
(07:11 -0800)
Change-Id: Ieb1f3cdd9a69cff091b73983f68c03cb5d26b9d7
Trivial merge