tree 007c00e6037604e089a2472e9810f81dc6069dac
parent 0c710a481276fba5ecbc5aa868d53c82ccba11dd
parent 7423fb5352c3e02979f653267974b5de5c4f90c7
author Gilles Debunne <debunne@google.com> 1322589578 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1322589578 -0800

am 7423fb53: Merge "Restoring mLayout has private in TextView"

* commit '7423fb5352c3e02979f653267974b5de5c4f90c7':
  Restoring mLayout has private in TextView