tree 403a541f7476eeed4df2e9af7bf9037c36ae44b4
parent 9ec6d402fab5ec988a5c8cce10fb61df6acef31a
parent 39b700fcc501a5c9b2fb83d4b754fb24d43d5c49
author Sunny Goyal <sunnygoyal@google.com> 1449252294 -0800
committer Sunny Goyal <sunnygoyal@google.com> 1449252294 -0800

resolve merge conflicts of 39b700fcc5 to ub-launcher3-master.

Change-Id: I394258be0c75289cab2f5141c0fb765504527420