OSDN Git Service

(root) / android-x86 / frameworks-av.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 60d87c5 c8c5ad6)
am 2ad5a49a: (-s ours) Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 11 Oct 2012 12:59:17 +0000 (05:59 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 11 Oct 2012 12:59:17 +0000 (05:59 -0700)
* commit '2ad5a49adfefa0d9c34ec9ea387fc7a30f1e7be6':


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