tree 588a2a309fdc89edeed3526149fcccd8a5248883
parent 86f2b21a780824c1b1f6134e4a2d1b87a99045b7
parent 998dbecf5397162f13acb8a84cfe71c2ed4d8741
author Tony Wickham <twickham@google.com> 1495484387 +0000
committer android-build-merger <android-build-merger@google.com> 1495484387 +0000

Merge "Rename "Settings" to "Home settings"" into ub-launcher3-dorval-polish
am: 998dbecf53

Change-Id: I5fc6cc32851ed6b2d135e8a12c9d1fee478dedab