OSDN Git Service

(root) / android-x86 / frameworks-av.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d77312b e6105c2)
am e6105c26: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 21 Jun 2013 18:58:20 +0000 (11:58 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 21 Jun 2013 18:58:20 +0000 (11:58 -0700)
* commit 'e6105c26a5b506f96e9fe1d3fec64a8b2ed1d6dd':


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