commit | d5dbf617578506310e78b950b011dc3dbb5432ea | [log] [tgz] |
---|---|---|
author | Tony Wickham <twickham@google.com> | Fri May 19 10:52:19 2017 -0700 |
committer | Tony Wickham <twickham@google.com> | Fri May 19 10:52:19 2017 -0700 |
tree | 8700d07437298811da705dbfbc02a8ca6052191d | |
parent | 7056275771eeb3c8acbffd28192a0c6d3ed249c7 [diff] | |
parent | 02aced978285c8a78eb98ee22130cf43017a4fa6 [diff] |
resolve merge conflicts of 02aced978 to ub-launcher3-dorval-polish Test: I solemnly swear I tested this conflict resolution. Change-Id: Ib44ce0130b9eb01c354f18326d7d3a1eeb2c5eb8