tree a6f24dd793e437135bb4624d15f75eae5a77e085
parent d74633cbc559109e57b0f4531fb6556e79d7a453
parent 629a67c5ac33409ebccf13284505a4cadc65656a
author Tony <twickham@google.com> 1496457229 -0700
committer Tony <twickham@google.com> 1496457229 -0700

resolve merge conflicts of 629a67c5a to ub-launcher3-dorval-polish

Test: I solemnly swear I tested this conflict resolution.
Change-Id: I5aed3f0c978976c499b532c816d81196cb11e3a1