tree e4b454238063d82dea40c8228a98355c268e1608
parent c27a05132042149fdcc926aeebc1a284cece1aa4
parent a0d5a040b84a4521819306bff0c5ddb5dc5300e1
author Adrian Roos <roosa@google.com> 1389751095 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1389751095 +0000

Merge "Replace "hotseat" with "Favorites tray" in user visible strings." into jb-ub-now-kermit