tree d736721f562fa5f56064e445e89574c50144553d
parent 7fc94d7aacddb12e6d50401314fdc029d20939a6
parent ce44516dd869dff1d6a744e26625a662d9567a10
author Tony Wickham <twickham@google.com> 1491956810 -0700
committer Tony Wickham <twickham@google.com> 1491956810 -0700

resolve merge conflicts of ce44516dd to ub-launcher3-master

Change-Id: I6f4455c1d4bedf778850acbb1e1c7372d532e13a