OSDN Git Service

(root) / android-x86 / frameworks-av.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7801598 4b60ac0)
am 4b60ac04: Merge "Fixed redefinition of \'i\' with a different type error"
authorJean-Baptiste Queru <jbq@google.com>
Thu, 23 Aug 2012 20:01:44 +0000 (13:01 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 23 Aug 2012 20:01:44 +0000 (13:01 -0700)
* commit '4b60ac04a878eaf8344b56189509ccd6925855c2':
  Fixed redefinition of 'i' with a different type error


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