| commit | d7d5bd878ac95632f9a97325358238a0acc10845 | [log] [tgz] |
|---|---|---|
| author | Sunny Goyal <sunnygoyal@google.com> | Fri Dec 18 15:04:13 2015 -0800 |
| committer | Sunny Goyal <sunnygoyal@google.com> | Fri Dec 18 15:04:13 2015 -0800 |
| tree | 05594a91a96ca6ea6dce4c8a1fff8a1e6545b0a7 | |
| parent | d3b53c3fa44f7e3a92e6971150626d7c59a178d5 [diff] | |
| parent | ffa123769807675869819037676717585d3fe647 [diff] |
resolve merge conflicts of ffa1237698 to ub-launcher3-master. Change-Id: I65beecb5bbbfe9c4b33d6ca639118cb615c4120a