OSDN Git Service

(root) / android-x86 / frameworks-av.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 24a0ab1 af4eab5)
am f93f5bf4: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do...
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 15 Oct 2012 14:42:48 +0000 (07:42 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 15 Oct 2012 14:42:48 +0000 (07:42 -0700)
* commit 'f93f5bf4a48df3b1557734a1e945b9556ce16f92':


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