tree 3705cb3b36de74e20d973598416c885f51944411
parent c49992c91ca086fac89310f38a1e66968db34a8a
parent 7036d76a6e172de300c63cb9c33b65a63fe7ce0f
author Dirk Dougherty <ddougherty@google.com> 1298438098 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1298438098 -0800

am 7036d76a: Merge "Doc change: Add doc for GL texture declaration/filtering, hardwareAccelerated manifest attr." into honeycomb

* commit '7036d76a6e172de300c63cb9c33b65a63fe7ce0f':
  Doc change: Add doc for GL texture declaration/filtering, hardwareAccelerated manifest attr.