OSDN Git Service

(root) / android-x86 / frameworks-av.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bd398c6 81972da)
am 81972daf: (-s ours) Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 17 May 2013 19:56:09 +0000 (12:56 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 17 May 2013 19:56:09 +0000 (12:56 -0700)
* commit '81972daf3323a130ca06c9999a3a8530e33fece9':


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