OSDN Git Service

am 1a6e29aa: am d933edc7: am 9ecada44: am dfd4f523: am d228a038: Merge "mNativeCanvas...
authorNarayan Kamath <narayan@google.com>
Wed, 29 Jan 2014 15:40:59 +0000 (15:40 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 29 Jan 2014 15:40:59 +0000 (15:40 +0000)
* commit '1a6e29aae589073bfd6bd5f42816e622584cfb7a':
  mNativeCanvas is long, not int.

1  2 
core/jni/android_view_TextureView.cpp

Simple merge