tree 3f1417cdd5fd40f79d1e630e6483dd528763ea94
parent b5352011e6e890769454ab3335d88f5b3f19d498
author Adam Cohen <adamcohen@google.com> 1428351088 -0700
committer Adam Cohen <adamcohen@google.com> 1428351098 -0700

resolved conflicts for merge of 68fdeaad to ub-launcher3-burnaby

Change-Id: I29aa5b37968b1ced81cdeb68a021db9310047252