| commit | c90e21f28683a9256bfda7824bd4cf263a082f58 | [log] [tgz] |
|---|---|---|
| author | Sunny Goyal <sunnygoyal@google.com> | Thu Feb 25 09:21:44 2016 -0800 |
| committer | Sunny Goyal <sunnygoyal@google.com> | Thu Feb 25 09:21:44 2016 -0800 |
| tree | 652abc5e38c01c86ac3c4dc938c3b1fe36ade073 | |
| parent | 7515f1b41c8a857b076490b170cd074086da4cd3 [diff] | |
| parent | 078d4de90b2a759e2fe465763f8a95bbf13592bb [diff] |
resolve merge conflicts of 078d4de90b to ub-launcher3-calgary Change-Id: Iec05a686848a03fa76a893d33fa4c465f00e8a71