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:
9d7b4c0
bd98366
)
Reconcile with ics-mr1-release
author
The Android Open Source Project
<initial-contribution@android.com>
Wed, 21 Mar 2012 15:23:03 +0000
(08:23 -0700)
committer
The Android Open Source Project
<initial-contribution@android.com>
Wed, 21 Mar 2012 15:23:03 +0000
(08:23 -0700)
Change-Id: I10d78e60e39606f85cfa6fc7e9a7da14db0eeb0a
Trivial merge