| commit | 72c689a7a27d0bddf804fdfd1eb69c9bc1a901f7 | [log] [tgz] |
|---|---|---|
| author | Tony Wickham <twickham@google.com> | Thu Oct 08 18:32:22 2015 -0700 |
| committer | Tony Wickham <twickham@google.com> | Thu Oct 08 18:32:22 2015 -0700 |
| tree | 61ece8a33b15cee4c5d27e953453b25ba72901c3 | |
| parent | e2722996e87bd2a469b257e1927b12c4c793b0c0 [diff] | |
| parent | d70a4b7b7805f0fd61cb34487b4f6cc620025723 [diff] |
resolved conflicts for d70a4b7b to ub-launcher3-master Change-Id: Ib04f80eeebf551fc026925830fc4739d1c620513