tree 855537a8e98c0abdd6ed481b216d2603ddc719d3
parent 52c3685613554319651df6db00162f575ce38e4e
parent 1416bd022f344b4fdeadcbdbf2f87e19f0fac7e7
author TreeHugger Robot <treehugger-gerrit@google.com> 1516212525 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1516212525 +0000

Merge "Ensure a user's SP does't change."