OSDN Git Service

(root) / android-x86 / frameworks-av.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e341547 9c450b3)
am b388138f: resolved conflicts for merge of 3fe7ee65 to ics-mr1-plus-aosp
authorEric Laurent <elaurent@google.com>
Sat, 17 Mar 2012 00:26:15 +0000 (17:26 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 17 Mar 2012 00:26:15 +0000 (17:26 -0700)
* commit 'b388138ff2986d6883fa9331fa91ae5e18ae81a0':


Trivial merge
frameworks/av
About OSDN
Find Software
Develop Software
Help