OSDN Git Service

(root) / android-x86 / frameworks-av.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cf5dd91 1bb5925)
am 1bb59258: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 11 Jul 2013 17:17:25 +0000 (10:17 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 11 Jul 2013 17:17:25 +0000 (10:17 -0700)
* commit '1bb59258458350af518170558120783bc2f9e61d':


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