tree 59f1195b66f6adab842c52e86c3e83688b835a3b
parent 1f832f85d59600fc4c212dec51a5112a6b7427d5
parent e78e3d734b577c1ab6dc0738a83600374908ea52
author Sunny Goyal <sunnygoyal@google.com> 1443207016 -0700
committer Sunny Goyal <sunnygoyal@google.com> 1443207016 -0700

resolved conflicts for e78e3d73 to ub-launcher3-master

Change-Id: Idc119a57e21cf6016ee0fd91866839301db072d6