tree 4bc36b62b4994f8b9110efbb9d0914199168e886
parent b733218c53b260bc6c9a3703a39d356152890ca0
parent 33778ec01983646a7941c9b274618126cf1f464e
author Adrian Roos <roosa@google.com> 1389782411 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1389782411 -0800

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

* commit '33778ec01983646a7941c9b274618126cf1f464e':
  Replace "hotseat" with "Favorites tray" in user visible strings.