tree 6d936431cd3172528fc9d6eedf5a083ffdf53817
parent 33778ec01983646a7941c9b274618126cf1f464e
parent 5dee7aff5fa8774d37977d12df7ce8986752321d
author Dan Sandler <dsandler@android.com> 1389797193 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1389797194 +0000

Merge "restore app favorites and screens" into jb-ub-now-kermit