| commit | 2feac00e2b9cf46269ffa11bb71ba412e9c3d1b1 | [log] [tgz] |
|---|---|---|
| author | Tony Wickham <twickham@google.com> | Thu Apr 20 15:35:38 2017 -0700 |
| committer | Tony Wickham <twickham@google.com> | Thu Apr 20 16:05:31 2017 -0700 |
| tree | 5d7c55f1616972707c0966ff5cdfc25015df4c13 | |
| parent | dbfc9014feab2acad5db788f09f35723d4e4d0a1 [diff] | |
| parent | cf895ccc2c7b0ca82f5ccde9f7cb78a8f7a0836e [diff] |
resolve merge conflicts of cf895ccc2 to ub-launcher3-master Test: I solemnly swear I tested this conflict resolution. Change-Id: I9f60c248455d2c672fb70524111c169803312c48