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:
a9798d3
fee0357
)
Reconcile with ics-mr1-release
author
The Android Open Source Project
<initial-contribution@android.com>
Tue, 20 Dec 2011 21:08:33 +0000
(13:08 -0800)
committer
The Android Open Source Project
<initial-contribution@android.com>
Tue, 20 Dec 2011 21:08:33 +0000
(13:08 -0800)
Change-Id: I123bd5ae61ab8c4f6de1a6640faf0bab89f6aa78
Trivial merge