OSDN Git Service

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)
commit07315f8262f843f3624c70974642e4fb733a661c
tree98dcde6faf3c948c4d7c69f9dfb95e3c47247960
parent780159840d754eae8e4e3f693ea10932634053f8
parent4b60ac04a878eaf8344b56189509ccd6925855c2
am 4b60ac04: Merge "Fixed redefinition of \'i\' with a different type error"

* commit '4b60ac04a878eaf8344b56189509ccd6925855c2':
  Fixed redefinition of 'i' with a different type error