| commit | 66d91e51d4ea5f3dc0cc603559a341c9c662289b | [log] [tgz] |
|---|---|---|
| author | Sunny Goyal <sunnygoyal@google.com> | Mon Mar 27 10:40:52 2017 -0700 |
| committer | Sunny Goyal <sunnygoyal@google.com> | Mon Mar 27 10:40:52 2017 -0700 |
| tree | 586813ef511464771cb80f63557b2fc2e427b22d | |
| parent | 5756900508177f6be1c1e9c1111d785a1e575a4d [diff] | |
| parent | 40dfa3bf6ebe96d28223342fe50b9cb4d37edb2d [diff] |
resolve merge conflicts of 40dfa3bf6 to ub-launcher3-master Test: I solemnly swear I tested this conflict resolution. Change-Id: Iee500631827ebc48c63c203fdcd0de888adcb135