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:
00b82d3
53ea28a
)
Reconcile with ics-mr1-release
author
The Android Open Source Project
<initial-contribution@android.com>
Thu, 8 Dec 2011 18:22:02 +0000
(10:22 -0800)
committer
The Android Open Source Project
<initial-contribution@android.com>
Thu, 8 Dec 2011 18:22:02 +0000
(10:22 -0800)
Change-Id: I409eea7f746a37d96ba1af9b60488d93e7e39d96
Trivial merge