| commit | 623daea93b8ca55b9cc99516df2284bde4322a0c | [log] [tgz] |
|---|---|---|
| author | Tony Wickham <twickham@google.com> | Thu Apr 20 16:24:09 2017 -0700 |
| committer | Tony Wickham <twickham@google.com> | Thu Apr 20 16:24:09 2017 -0700 |
| tree | ba3bdf1678d0443e327a44525c17db47d5e4ff39 | |
| parent | 2feac00e2b9cf46269ffa11bb71ba412e9c3d1b1 [diff] | |
| parent | 6f725f2831e90f1df11f1315906c7554c87c5722 [diff] |
resolve merge conflicts of 6f725f283 to ub-launcher3-master Test: I solemnly swear I tested this conflict resolution. Change-Id: I3559969b62a9a4b1ec04697109636e8cb0fd9fc8