tree bf2b2fc4a716d84a22bf84437d3b0ad17460742e
parent 78805488af6d622bc53a6c1b383fc5e00f54a056
parent 89135a3d398545a8108b0bce7b232a230a14d03b
author Raphael Moll <ralf@android.com> 1335199767 -0700
committer android code review <noreply-gerritcodereview@google.com> 1335199767 -0700

Merge "Ignore a settings file recreated by P2."