tree 7a4212514654e18eb099e50564b8fd7fa27653b6
parent 66e2b3b5b53a5793cd7c9febe8dd3d81da98274b
parent a1840c6e292414d024e37ba7d716fe609e44b557
author Tony Wickham <twickham@google.com> 1497303301 +0000
committer android-build-merger <android-build-merger@google.com> 1497303301 +0000

Merge "Fix typo in preferences" into ub-launcher3-dorval-polish
am: a1840c6e29

Change-Id: Iec1d99618864335438a902be4435c720c783b183