tree 61ce56cf42c01434ab16e5c4e0f17c1da44b1521
parent 4b4c835bd9c5d9a815f09c1fb8068f57e47f4c85
parent 8ac896b8c84066c109c2c4b97805f36270636121
author Adam Cohen <adamcohen@google.com> 1397179105 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1397179105 +0000

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

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