OSDN Git Service

am 33778ec0: Merge "Replace "hotseat" with "Favorites tray" in user visible strings...
authorAdrian Roos <roosa@google.com>
Wed, 15 Jan 2014 10:40:11 +0000 (02:40 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 15 Jan 2014 10:40:11 +0000 (02:40 -0800)
* commit '33778ec01983646a7941c9b274618126cf1f464e':
  Replace "hotseat" with "Favorites tray" in user visible strings.


Trivial merge