tree 273b4b3aa02796bc8bdd73e40e26d81c25fa5e25
parent 772a97108bf5508a0a8aab8a7db51a6081435a5d
parent defca66be6d5968b9d2bdd7c708bdf0971fa0cf1
author Sunny Goyal <sunnygoyal@google.com> 1422669710 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422669710 +0000

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

* commit 'defca66be6d5968b9d2bdd7c708bdf0971fa0cf1':