| commit | a2d1540c0e6051e670cabdb48976ee6da53f2c2f | [log] [tgz] |
|---|---|---|
| author | Tony Wickham <twickham@google.com> | Wed May 03 12:59:09 2017 -0700 |
| committer | Tony Wickham <twickham@google.com> | Wed May 03 12:59:09 2017 -0700 |
| tree | 6f314c09bbeb6e3195b5ab1d037b1eaf02bfeeac | |
| parent | db67e7c7a354cdfdf4473a9087f39633fbb4dc7e [diff] | |
| parent | 82eb1f0ea682b896ab35d2f25ebaaae29a37b45c [diff] |
resolve merge conflicts of 82eb1f0ea to ub-launcher3-dorval-polish Test: I solemnly swear I tested this conflict resolution. Change-Id: Ic1f6ace04ec2c11206276df76ef7a20df545d604