| commit | 488d4bdf26fb8cefd4f2f83535fde1b07202b545 | [log] [tgz] |
|---|---|---|
| author | Sunny Goyal <sunnygoyal@google.com> | Tue Aug 04 10:26:12 2015 -0700 |
| committer | Sunny Goyal <sunnygoyal@google.com> | Tue Aug 04 10:26:12 2015 -0700 |
| tree | 95eb26d4ee28df9ec2eba2284bc59ec44251e7a5 | |
| parent | 9e97bf99197079092084a2fc8308f56ea96abff5 [diff] | |
| parent | c451da705907edaaaef4fdd44f1304872c0b5b0d [diff] |
resolved conflicts for merge of c451da70 to ub-launcher3-master Change-Id: I738fa16f82b3f3f1f6c63c5d1ce81347ade6467a