| commit | ecd365293fedf8b78cf1e8df0b9d93968c9910ba | [log] [tgz] |
|---|---|---|
| author | Sunny Goyal <sunnygoyal@google.com> | Thu Feb 18 10:23:18 2016 -0800 |
| committer | Sunny Goyal <sunnygoyal@google.com> | Thu Feb 18 10:23:18 2016 -0800 |
| tree | fa3ef4506b2bd56d92397586dafa51a0d327f6f0 | |
| parent | f63c46bf5e304c36fc15fa4f15af9cb98fde762d [diff] | |
| parent | 2953833bcba6c4aba3c5211bfb41434321ce255f [diff] |
resolve merge conflicts of 2953833bcb to ub-launcher3-calgary Change-Id: Ia7fc406d1e287974e87979af9a4b1f5f1e4e23d9