| commit | defca66be6d5968b9d2bdd7c708bdf0971fa0cf1 | [log] [tgz] |
|---|---|---|
| author | Sunny Goyal <sunnygoyal@google.com> | Sat Jan 31 01:08:21 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Jan 31 01:08:21 2015 +0000 |
| tree | 10da860fcff71886af91d082e31f0e1917926848 | |
| parent | 029f33a824ed5b382559e831d74744127de05b86 [diff] | |
| parent | 0cc5a6562a7910c65ee8ed321b2fdcc055a72917 [diff] |
am 0cc5a656: am 5bb4c94a: Merge "Don\'t remove content URI shortcuts during restore" into ub-now-porkchop * commit '0cc5a6562a7910c65ee8ed321b2fdcc055a72917':