| commit | b9cc38031c1c844af13f63ef4cf37211595835b6 | [log] [tgz] |
|---|---|---|
| author | Winson <winsonc@google.com> | Wed Sep 09 17:11:29 2015 -0700 |
| committer | Winson <winsonc@google.com> | Wed Sep 09 17:11:29 2015 -0700 |
| tree | 7709815140dee589113d284e4fdc5b1e3efbfaad | |
| parent | 1c3dc4cf4de404f76dbefc57e86b66121149e6e3 [diff] | |
| parent | 1268855200e519985e2c845ba84d2d613fa4a36c [diff] |
resolved conflicts for 12688552 to ub-launcher3-master Change-Id: Iaf97c5ae486e19cd3ad320ed88346571252d878a