tree 10da860fcff71886af91d082e31f0e1917926848
parent 029f33a824ed5b382559e831d74744127de05b86
parent 0cc5a6562a7910c65ee8ed321b2fdcc055a72917
author Sunny Goyal <sunnygoyal@google.com> 1422666501 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422666501 +0000

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

* commit '0cc5a6562a7910c65ee8ed321b2fdcc055a72917':