tree fe1093e354685551e028d5fd0dbd97ffa1223d8f
parent 7ee999a044d8ad5edac9aa7aa10c56f7044314bd
parent 5bb4c94a175938dff8178d781a3a839cbdc142b1
author Sunny Goyal <sunnygoyal@google.com> 1409931282 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1409931282 +0000

am 5bb4c94a: Merge "Don\'t remove content URI shortcuts during restore" into ub-now-porkchop

* commit '5bb4c94a175938dff8178d781a3a839cbdc142b1':
  Don't remove content URI shortcuts during restore