| commit | f912beb2ee4b75af1fe8c710d6948b9737fed531 | [log] [tgz] |
|---|---|---|
| author | Sunny Goyal <sunnygoyal@google.com> | Tue Oct 20 10:37:15 2015 -0700 |
| committer | Sunny Goyal <sunnygoyal@google.com> | Tue Oct 20 10:37:15 2015 -0700 |
| tree | a8e5ae80d822105c36ff218b739b735a4d5ba9f6 | |
| parent | 38ac73a095c99c18ca31b8d9cd14959a762928b7 [diff] | |
| parent | fe3db428abc07d253b816bf70d6820a8339becbc [diff] |
resolve merge conflicts of fe3db428ab to ub-launcher3-master. Change-Id: Icc60a61f621fefe9db67b178921e62f7d72d7e5a