tree fe1093e354685551e028d5fd0dbd97ffa1223d8f
parent ea1b46065e59e7a78f062b750e03164e09ec5610
parent 0cc5a6562a7910c65ee8ed321b2fdcc055a72917
author Sunny Goyal <sunnygoyal@google.com> 1410184127 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1410184127 +0000

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

* commit '0cc5a6562a7910c65ee8ed321b2fdcc055a72917':
  Don't remove content URI shortcuts during restore