OSDN Git Service

(root) / android-x86 / frameworks-av.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 51ee28d a453980)
am a4539807: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 13 Jun 2013 15:25:37 +0000 (08:25 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 13 Jun 2013 15:25:37 +0000 (08:25 -0700)
* commit 'a45398078e4f798a34310a2d5213e07eefb14238':


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