tree c028bfe537607823c37e2ffc8c713c73059d3130
parent b82b2c0dd6bff3363a3b7fbdd28c4ae6d5f022fa
parent 79fa8d2fc03070a954eb24b78179e81e6f4d29b2
author Sunny Goyal <sunnygoyal@google.com> 1422685334 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422685334 +0000

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

* commit '79fa8d2fc03070a954eb24b78179e81e6f4d29b2':