| commit | f457fa6788d13b8deac3f19687153013239929d1 | [log] [tgz] |
|---|---|---|
| author | Sunny Goyal <sunnygoyal@google.com> | Sat Jan 31 06:22:14 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Jan 31 06:22:14 2015 +0000 |
| tree | c028bfe537607823c37e2ffc8c713c73059d3130 | |
| parent | b82b2c0dd6bff3363a3b7fbdd28c4ae6d5f022fa [diff] | |
| parent | 79fa8d2fc03070a954eb24b78179e81e6f4d29b2 [diff] |
am 79fa8d2f: am defca66b: am 0cc5a656: am 5bb4c94a: Merge "Don\'t remove content URI shortcuts during restore" into ub-now-porkchop * commit '79fa8d2fc03070a954eb24b78179e81e6f4d29b2':