OSDN Git Service

(root) / android-x86 / frameworks-av.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8147a6d 05e87d5)
am 05e87d53: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Sun, 16 Jun 2013 14:45:34 +0000 (07:45 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sun, 16 Jun 2013 14:45:34 +0000 (07:45 -0700)
* commit '05e87d536ed2b7cf1d68135121b630031e5d56c2':


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