tree 0d63531b0a4841d3b0ee5190f721065bc00d57a4
parent f73c42ed6d17dac7674e254212fd52966a320206
parent 73164dc7bce52f6658eb2f786c45538e52404ab4
author Craig Mautner <cmautner@google.com> 1357633602 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1357633602 -0800

am 73164dc7: Merge "Combine DimAnimator and DimSurface into DimLayer"

* commit '73164dc7bce52f6658eb2f786c45538e52404ab4':
  Combine DimAnimator and DimSurface into DimLayer