| commit | c32c63c46e933fb6c9038f6e18f24a2fef7eff9c | [log] [tgz] |
|---|---|---|
| author | Tony Wickham <twickham@google.com> | Mon Feb 01 14:51:35 2016 -0800 |
| committer | Tony Wickham <twickham@google.com> | Mon Feb 01 14:51:35 2016 -0800 |
| tree | 099fda5e4089ae87581ae31e157dd9570bf642e6 | |
| parent | ad37152c14c716f678d07dd568811a9704c2a9c8 [diff] | |
| parent | b9759d399be4269a65b08988e50148f7d971fdf3 [diff] |
resolve merge conflicts of b9759d399b to ub-launcher3-calgary. Change-Id: I66230c15e5eaeef316d4e2f14b85c6ff1b6e977d