OSDN Git Service

(root) / android-x86 / frameworks-av.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a8d21ea 07315f8)
am 07315f82: am 4b60ac04: Merge "Fixed redefinition of \'i\' with a different type...
authorJean-Baptiste Queru <jbq@google.com>
Fri, 24 Aug 2012 14:29:47 +0000 (07:29 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 24 Aug 2012 14:29:47 +0000 (07:29 -0700)
* commit '07315f8262f843f3624c70974642e4fb733a661c':
  Fixed redefinition of 'i' with a different type error


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