tree 00bbbc1dfc2924206adb3753652009b8188930e1
parent 3d2d6e32c47e24f1bb9f96eb456554d96338e358
parent 44f834133e106550a67ecf246e8bc9d4e1644c56
author Dan Sandler <dsandler@android.com> 1389797356 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1389797356 -0800

am 44f83413: Merge "restore app favorites and screens" into jb-ub-now-kermit

* commit '44f834133e106550a67ecf246e8bc9d4e1644c56':
  restore app favorites and screens