tree 61ce56cf42c01434ab16e5c4e0f17c1da44b1521
parent 1a614dafcb1e2562617b395737b27a39078cfe0e
parent d08da56f0a4b56d16836fb85c2764e57ecdfcc20
author Adam Cohen <adamcohen@google.com> 1397179243 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1397179243 +0000

am d08da56f: am 8ac896b8: Merge "Fix serious data loss issue for folders and hotseat items" into ub-now-mister-ugly

* commit 'd08da56f0a4b56d16836fb85c2764e57ecdfcc20':
  Fix serious data loss issue for folders and hotseat items