OSDN Git Service

(root) / android-x86 / frameworks-av.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ceb1f0a 0a95b17)
am 0a95b17c: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 11 Jul 2013 15:08:09 +0000 (08:08 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 11 Jul 2013 15:08:09 +0000 (08:08 -0700)
* commit '0a95b17c93f8ca0a4ed46bdc5797aa81f46f028c':


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