tree a3003c614a4ebcce1549ce9a3fb800dc6d3d10ad
parent 72c689a7a27d0bddf804fdfd1eb69c9bc1a901f7
parent fa3c369cc30345e23b2b90415a3348490dd2a0b2
author Tony Wickham <twickham@google.com> 1444410356 -0700
committer Tony Wickham <twickham@google.com> 1444410356 -0700

resolved conflicts for fa3c369c to ub-launcher3-master

Change-Id: I6bfc3d3b731a414060d86d4f1dfc5480c279edc9