tree 49d879d726758576448ca93fb056d01d26a31386
parent 8b69297759bb2f4584e3c120ed8de029693605d8
parent 4ca67e3a08e1c0acf698719eb7489dad42e51e7d
author Stuart Scott <stuartscott@google.com> 1399072986 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1399072986 +0000

am 4ca67e3a: am 61200853: am 295b2051: Merge "libctsopengl_jni: Change char* to unsigned char*"

* commit '4ca67e3a08e1c0acf698719eb7489dad42e51e7d':
  libctsopengl_jni: Change char* to unsigned char*