tree f361aa77d7e5e7a4c611a1f04eaf8a8a9ef01175
parent df0a957dd7b47437cc8e617628fd745681450959
parent 03213aa8899c98f0f8cb5d29f06249771d866744
author Android (Google) Code Review <android-gerrit@google.com> 1246572664 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1246572664 -0700

Merge change 6140

* changes:
  Add support for multitexture and fix allocation ref counting bug in RS.  Add plaque to rollo and leave it disabled due to ugly appearance.