OSDN Git Service

(root) / android-x86 / frameworks-av.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b279312 6a26abb)
resolved conflicts for merge of 532679a5 to master
authorDirk Dougherty <ddougherty@google.com>
Thu, 8 Mar 2012 00:58:03 +0000 (16:58 -0800)
committerDirk Dougherty <ddougherty@google.com>
Thu, 8 Mar 2012 00:58:03 +0000 (16:58 -0800)
Change-Id: Id60d047c0e1f288acff97526c016cca632873b6b


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