tree dc9f072b84d93ac15b50be18b20e4c4bfaf8688f
parent 691b47e154f702bc77472e670281a6be4252e89d
parent f95e3dd23cb6cbd7a86dece3c4bafff71307721a
author Xavier Ducrohet <xav@android.com> 1263947688 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1263947688 -0800

am f95e3dd2: am 5e083024: ADT/Layoutlib: shader clean-up.

Merge commit 'f95e3dd23cb6cbd7a86dece3c4bafff71307721a'

* commit 'f95e3dd23cb6cbd7a86dece3c4bafff71307721a':
  ADT/Layoutlib: shader clean-up.