| commit | c8eb6fbcff61f5f664c323f51bd4bd893499a22e | [log] [tgz] |
|---|---|---|
| author | Stuart Scott <stuartscott@google.com> | Fri May 02 23:23:06 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri May 02 23:23:06 2014 +0000 |
| tree | 49d879d726758576448ca93fb056d01d26a31386 | |
| parent | 8b69297759bb2f4584e3c120ed8de029693605d8 [diff] | |
| parent | 4ca67e3a08e1c0acf698719eb7489dad42e51e7d [diff] |
am 4ca67e3a: am 61200853: am 295b2051: Merge "libctsopengl_jni: Change char* to unsigned char*" * commit '4ca67e3a08e1c0acf698719eb7489dad42e51e7d': libctsopengl_jni: Change char* to unsigned char*