tree d7cc40876912188999cd59a401c980e7e0fa2573
parent ab37200b39ae24054c428479cbed63596297773d
parent 7c91ae77caa1b277bba162ada95a8a104da9923c
author David Turner <digit@android.com> 1309262141 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1309262141 -0700

am 7c91ae77: Merge "tex 0 is legal."

* commit '7c91ae77caa1b277bba162ada95a8a104da9923c':
  tex 0 is legal.