| commit | 97660f7a9421b4d9068183b6fb1ec107df8c7946 | [log] [tgz] |
|---|---|---|
| author | Sunny Goyal <sunnygoyal@google.com> | Thu Mar 03 13:52:22 2016 -0800 |
| committer | Sunny Goyal <sunnygoyal@google.com> | Thu Mar 03 13:52:22 2016 -0800 |
| tree | 9d2bed02cc699b02d5b24ca983a1e2d3e577fa79 | |
| parent | 3169e9c331d16f622838093743fc20f8f2f4500d [diff] | |
| parent | 2494c3f1681e71af06556ef47de16f018811f7e3 [diff] |
resolve merge conflicts of 2494c3f168 to ub-launcher3-calgary Change-Id: I807016057da9b867ebb2c8f3ee2027a3a2688d30