| commit | 319d36a9d1f425d3044215f109a0e70cfdb2b034 | [log] [tgz] |
|---|---|---|
| author | Jesse Hall <jessehall@google.com> | Fri Jun 06 16:37:08 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jun 06 16:37:08 2014 +0000 |
| tree | 0541c5adb0acab8e6603bda20385a174d84457fa | |
| parent | ba490132c0ea1ea476f0d8f4e0d796daa3ef421b [diff] | |
| parent | 6ed7e6dfcc36a41ddface0527d1e4a2c053cc736 [diff] |
am 6ed7e6df: am ea385828: am 3d1f0837: Merge "ndk: Remove extra GLES symbols on 64-bit platforms" * commit '6ed7e6dfcc36a41ddface0527d1e4a2c053cc736': ndk: Remove extra GLES symbols on 64-bit platforms