tree 6b480e97a29a81b9e82a26a0b9f22302b796fca6
parent 26f462d9c01cd1fdee5e1856bb8bf4c4d799d460
parent 199d541c8d5a62551e7d78559824a52270e8cb13
author Michael Jurka <mikejurka@google.com> 1366303551 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1366303551 -0700

am 199d541c: Merge "Trim widget names" into jb-mr2-dev

* commit '199d541c8d5a62551e7d78559824a52270e8cb13':
  Trim widget names