tree 985568b9e39d7cb586ddb0cce36b88ede688bc57
parent 87f68f186be12bf8b21e5a59d50fdf4c26e992da
parent a3505bfe99a0ef2dc0e0ad8c844b3d6d45c6a9f7
author Adam Cohen <adamcohen@google.com> 1350669072 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1350669072 -0700

am a3505bfe: am 2a11598a: am 381fe4ce: Adding width / height to cling text style

* commit 'a3505bfe99a0ef2dc0e0ad8c844b3d6d45c6a9f7':
  Adding width / height to cling text style