| commit | f27cb0e6b1edb2a53de64fdd12d25f400a3acdd9 | [log] [tgz] |
|---|---|---|
| author | Sunny Goyal <sunnygoyal@google.com> | Wed Sep 23 16:12:02 2015 -0700 |
| committer | Sunny Goyal <sunnygoyal@google.com> | Wed Sep 23 16:12:02 2015 -0700 |
| tree | 846cc10d71a2452f4ba7acdc242c1bc3366c6a7c | |
| parent | 5a7a1ce0a7affdff02029793ac24b2581075acee [diff] | |
| parent | 8ac727b2c6627028960a1efe18ab9c72442eef48 [diff] |
resolved conflicts for 8ac727b2 to ub-launcher3-burnaby-polish Change-Id: I34e679bae7faae3c7ca725263fe6cc7c5611e63a