OSDN Git Service

(root) / android-x86 / frameworks-av.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 414abc5 bdebd48)
am bdebd481: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 26 Jun 2013 00:02:16 +0000 (17:02 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 26 Jun 2013 00:02:16 +0000 (17:02 -0700)
* commit 'bdebd4817cfe49fafedfe8f9c65930e03f9b508b':


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