tree d6b16d49244c4d45ba68f1546ca60b383e67f13f
parent 4884c642882af0a279673d7a95485069e58beb69
parent c08cb0ed7a01cd076e8277e49e1492eeab09e9fa
author Kenny Guy <kennyguy@google.com> 1407447442 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1407436780 +0000

Merge "Revert "Revert "Remove String version of getBadgedLabel""" into lmp-dev