tree 79a9f37c6e08b9ee4f02e5da6b7172d840b75fbc
parent e8af73a776d484f27fe0538fc6c8c88099f9930d
parent 187f9665f69745518ebc65327bd662cab3f90cb8
author Sunny Goyal <sunnygoyal@google.com> 1435282626 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1435282626 +0000

am 187f9665: Merge "Fixing backup restore" into ub-launcher3-burnaby

* commit '187f9665f69745518ebc65327bd662cab3f90cb8':
  Fixing backup restore