| commit | 6c300c89ecbac04c557a4695b1597ed35150f420 | [log] [tgz] |
|---|---|---|
| author | Tony Wickham <twickham@google.com> | Wed Apr 05 13:14:01 2017 -0700 |
| committer | Tony Wickham <twickham@google.com> | Wed Apr 05 13:14:01 2017 -0700 |
| tree | 086e9d50f1914a021267b61be27fab1f06803cb5 | |
| parent | 2dbcfb6cb01ebf7563810aa0b7f1c6638053faed [diff] | |
| parent | 128b7e59a12ae861be81adb38c3eb9ccde61c6b5 [diff] |
resolve merge conflicts of 128b7e59a to ub-launcher3-master Test: I solemnly swear I tested this conflict resolution. Change-Id: I927373593dfb1b67b504a76b1ad013357b363a6e