tree 654113481617716a013c508d56f53d5620a2c725
parent 6ef0f769397a9de34d6a6eafa1fb05a966c6e9fe
parent d896ee43cd9195a2a2742324733b036ee72875bb
author Sunny Goyal <sunnygoyal@google.com> 1450384316 -0800
committer Sunny Goyal <sunnygoyal@google.com> 1450384374 -0800

resolve merge conflicts of d896ee43cd to ub-launcher3-master.

Change-Id: If09db8d99e7065c08fcb81b8d97a68a2557d53d7