| commit | f514f207c2f2e22c4df179ce0d8eb16966e6b5dc | [log] [tgz] |
|---|---|---|
| author | Tony <twickham@google.com> | Fri Jun 02 19:33:49 2017 -0700 |
| committer | Tony <twickham@google.com> | Fri Jun 02 19:33:49 2017 -0700 |
| tree | a6f24dd793e437135bb4624d15f75eae5a77e085 | |
| parent | d74633cbc559109e57b0f4531fb6556e79d7a453 [diff] | |
| parent | 629a67c5ac33409ebccf13284505a4cadc65656a [diff] |
resolve merge conflicts of 629a67c5a to ub-launcher3-dorval-polish Test: I solemnly swear I tested this conflict resolution. Change-Id: I5aed3f0c978976c499b532c816d81196cb11e3a1