| commit | ad37152c14c716f678d07dd568811a9704c2a9c8 | [log] [tgz] |
|---|---|---|
| author | Sunny Goyal <sunnygoyal@google.com> | Fri Jan 29 14:30:08 2016 -0800 |
| committer | Sunny Goyal <sunnygoyal@google.com> | Fri Jan 29 14:30:08 2016 -0800 |
| tree | bf5e511281d04fd9b2ce87dc2bac4017b8d8d57b | |
| parent | a22921fc31930887fc9d6b3fb1ceb37c0ad098c5 [diff] | |
| parent | b171e5675b91e6e4fc1cf741b3b2d0313ad2fe27 [diff] |
resolve merge conflicts of b171e5675b to ub-launcher3-calgary. Change-Id: I329c7518d8c3f0f43e96c6446d5b53a6f4439211