tree 6b480e97a29a81b9e82a26a0b9f22302b796fca6
parent 5e5a44cad8871c3eea7e542a34a9fd15e5520509
parent f0f78ed090f8957058563a71983f94002b4f2dee
author Michael Jurka <mikejurka@google.com> 1366303802 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1366303802 -0700

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

* commit 'f0f78ed090f8957058563a71983f94002b4f2dee':
  Trim widget names