tree fe1093e354685551e028d5fd0dbd97ffa1223d8f
parent 9b8da88ebaf0521d380fd1dcc0a473c71edc7ca0
parent 938a53d8640ddec14b36b1e7ddc3e156824d9de0
author Sunny Goyal <sunnygoyal@google.com> 1409929106 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1409929107 +0000

Merge "Don't remove content URI shortcuts during restore" into ub-now-porkchop