tree a477b7ce35cb9c3454b1cf58a7640a698b40e5c5
parent 4958553a12d0f5b07212055f57535de8e0d58ef6
parent 5b523612138ead35f59ed3b3e265ba9c7351977e
author Chet Haase <chet@google.com> 1348682989 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1348682989 -0700

am 5b523612: am d48478e4: Merge "Assign default texture id of 0" into jb-mr1-dev

* commit '5b523612138ead35f59ed3b3e265ba9c7351977e':
  Assign default texture id of 0