| commit | a98e2105027ed494af5b969faa400cf1bf504343 | [log] [tgz] |
|---|---|---|
| author | Tony Wickham <twickham@google.com> | Wed Oct 21 14:41:25 2015 -0700 |
| committer | Tony Wickham <twickham@google.com> | Wed Oct 21 14:41:25 2015 -0700 |
| tree | cb3f79eb6a5accb676ef1cacdee3b373f63242be | |
| parent | 6f0f35806f860b9e4a4513ac219e2c5cd1ee56cd [diff] | |
| parent | d5d7fa10af06518c055d0ce3199c6b65fd21429b [diff] |
resolve merge conflicts of d5d7fa10af to ub-launcher3-master. Change-Id: I324b1a9cd3c6dce1d5d3b14d3ef95f798e5bc243