| commit | c1ff24c0779d40ac5dcadc05ce51b7056a4286bb | [log] [tgz] |
|---|---|---|
| author | Tony Wickham <twickham@google.com> | Fri Oct 30 10:37:43 2015 -0700 |
| committer | Tony Wickham <twickham@google.com> | Fri Oct 30 10:37:43 2015 -0700 |
| tree | 56420909e0bf52267165da9ee126ed8b13123e76 | |
| parent | c3642d45098eed97ee278f7db370335d7fd407fc [diff] | |
| parent | a3c74d10a7d6e2ae8520e73176f939011e726ccf [diff] |
resolve merge conflicts of a3c74d10a7 to ub-launcher3-master. Change-Id: Ibeb2499ac278e4094a2922501cfffad2489e58ed