OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cc5519c a64366e)
resolved conflicts for merge of cb66aec0 to graphics-dev
authorJason Sams <jsams@google.com>
Fri, 10 Feb 2012 23:27:26 +0000 (15:27 -0800)
committerJason Sams <jsams@google.com>
Fri, 10 Feb 2012 23:27:26 +0000 (15:27 -0800)
Change-Id: Ic8817f702b6993f046c89f2fc598c9fe3bf30fe8


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