tree ba3e0d51a8598b9c181a6c10cc661074c43c58e0
parent 5f17cddd0d324c4b605337060cb60420560c90c8
parent 553a8f6f44bbf0289f957815d6a0323a620147a8
author Sunny Goyal <sunnygoyal@google.com> 1433962027 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1433962027 +0000

am 553a8f6f: Merge "Fixing crash in restore" into ub-launcher3-burnaby

* commit '553a8f6f44bbf0289f957815d6a0323a620147a8':
  Fixing crash in restore