| commit | 75c7c5ae287e79e8502bc9e23853ff64def8e8bf | [log] [tgz] |
|---|---|---|
| author | Sunny Goyal <sunnygoyal@google.com> | Wed Jan 27 16:55:50 2016 -0800 |
| committer | Sunny Goyal <sunnygoyal@google.com> | Wed Jan 27 16:55:50 2016 -0800 |
| tree | 3439a89b0545deb78bb62ff63131dca249531d37 | |
| parent | ccf3a9ed56a46b665a5aba6a5e0396ac07f79e68 [diff] | |
| parent | 6362683acb884ec72fe10f1cf394d178d3918a96 [diff] |
resolve merge conflicts of 6362683acb to ub-launcher3-calgary. Change-Id: Id48bf33912bf927121356a08b8501ee0070bfdc7