OSDN Git Service

(root) / android-x86 / frameworks-av.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9046684 2919677)
am 29196772: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 8 Jul 2013 22:37:11 +0000 (15:37 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 8 Jul 2013 22:37:11 +0000 (15:37 -0700)
* commit '291967728b02ad9a7d5545b0eb1ec0c4c3d664af':


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