tree d6cba2619c0e4d6c3f77162df366b634da4eafe7
parent 7d164ce1af16cbde44cfdda5b89755d755220979
parent 20576189bddb5cd87707c2f726341cad11fcf490
author Android (Google) Code Review <android-gerrit@google.com> 1244568718 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1244568718 -0700

am 20576189: Merge change 3351 into donut

Merge commit '20576189bddb5cd87707c2f726341cad11fcf490'

* commit '20576189bddb5cd87707c2f726341cad11fcf490':
  Add new text display attribute for gles version number
  SDK Updater: Add optional license elements to XML schema.