tree a7e2a6801e90234a0992cc6fa9970783d74ae0e3
parent 626a11cb3c85e6cf55ce523a87b348e760e9e527
parent 724c3c638a1890005652b492d4863c5c5b544648
author Tony Wickham <twickham@google.com> 1442969942 -0700
committer Tony Wickham <twickham@google.com> 1442970089 -0700

Fixing merge into ub-launcher3-master

Change-Id: Ifd9128c72f6e11855b1bb9272c6f193d688ba021