| commit | 2e52c90b3ff0a04bd734aa19c54c39cef186b653 | [log] [tgz] |
|---|---|---|
| author | Adam Cohen <adamcohen@google.com> | Mon Apr 06 13:11:28 2015 -0700 |
| committer | Adam Cohen <adamcohen@google.com> | Mon Apr 06 13:11:38 2015 -0700 |
| tree | 3f1417cdd5fd40f79d1e630e6483dd528763ea94 | |
| parent | b5352011e6e890769454ab3335d88f5b3f19d498 [diff] |
resolved conflicts for merge of 68fdeaad to ub-launcher3-burnaby Change-Id: I29aa5b37968b1ced81cdeb68a021db9310047252