tree 4ee91c8cc5aaaf92e8cb9375e1fe951b3a17289c
parent 1505f2a6a0a7ebdaff6767e989cbf4312377fee0
parent e384affda684a48c61d99ebfe8be40fb7d46d761
author Michael Jurka <mikejurka@google.com> 1331337877 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1331337877 -0800

Merge "Fix case where shortcut label wasn't updating"