tree ec915c905a612191adde69b0d7511636b681b312
parent 27687f31c043c7e8ef46ea19252f4ec6ad2de775
parent a2d1540c0e6051e670cabdb48976ee6da53f2c2f
author Tony Wickham <twickham@google.com> 1493842461 +0000
committer android-build-merger <android-build-merger@google.com> 1493842461 +0000

resolve merge conflicts of 82eb1f0ea to ub-launcher3-dorval-polish
am: a2d1540c0e

Change-Id: I810723316fa569b0b2259c3baeca7e62d6918ec6