tree 1cb902664d9afcd6734afeba76c91f152e4deb72
parent 8d562f78b4919babe1f7e32e974e5057dcfbb310
parent 3886333644467beeaf60c13fb94f242538067765
author Nicolas Roard <nicolas@android.com> 1262634161 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1262634161 -0800

am 38863336: layers support

Merge commit '3886333644467beeaf60c13fb94f242538067765' into eclair-mr2-plus-aosp

* commit '3886333644467beeaf60c13fb94f242538067765':
  layers support