commit | 79fa8d2fc03070a954eb24b78179e81e6f4d29b2 | [log] [tgz] |
---|---|---|
author | Sunny Goyal <sunnygoyal@google.com> | Sat Jan 31 02:01:50 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Sat Jan 31 02:01:50 2015 +0000 |
tree | 273b4b3aa02796bc8bdd73e40e26d81c25fa5e25 | |
parent | 772a97108bf5508a0a8aab8a7db51a6081435a5d [diff] | |
parent | defca66be6d5968b9d2bdd7c708bdf0971fa0cf1 [diff] |
am defca66b: am 0cc5a656: am 5bb4c94a: Merge "Don\'t remove content URI shortcuts during restore" into ub-now-porkchop * commit 'defca66be6d5968b9d2bdd7c708bdf0971fa0cf1':