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:
7383d41
aaa12ed
)
Reconcile with ics-mr0-release ics-mr1-release
author
The Android Open Source Project
<initial-contribution@android.com>
Fri, 18 Nov 2011 23:42:32 +0000
(15:42 -0800)
committer
The Android Open Source Project
<initial-contribution@android.com>
Fri, 18 Nov 2011 23:42:32 +0000
(15:42 -0800)
Change-Id: I31643242d240b4d1efef685583ec21934a88cc02
Trivial merge