| commit | 9ccb94b6e4613ee717550416db2b456d9f17702e | [log] [tgz] |
|---|---|---|
| author | Tony Wickham <twickham@google.com> | Thu Oct 15 11:18:26 2015 -0700 |
| committer | Tony Wickham <twickham@google.com> | Thu Oct 15 11:18:26 2015 -0700 |
| tree | 139221ae53676b8e3a76e71391c23853e39bb76e | |
| parent | 9a9765924fcc1171b447f2bb689db5cd888df7e3 [diff] | |
| parent | a8709ddbbf6338d71625ee1eef96e42bee042b31 [diff] |
resolved conflicts for a8709ddb to ub-launcher3-master Change-Id: I172395e6e172914627b6dec721070a66520557b1