diff options
| author | Tony Wickham <twickham@google.com> | 2017-05-19 10:52:19 -0700 |
|---|---|---|
| committer | Tony Wickham <twickham@google.com> | 2017-05-19 10:52:19 -0700 |
| commit | d5dbf617578506310e78b950b011dc3dbb5432ea (patch) | |
| tree | 8700d07437298811da705dbfbc02a8ca6052191d /src/com/android/launcher3/InvariantDeviceProfile.java | |
| parent | 7056275771eeb3c8acbffd28192a0c6d3ed249c7 (diff) | |
| parent | 02aced978285c8a78eb98ee22130cf43017a4fa6 (diff) | |
| download | android_packages_apps_Trebuchet-d5dbf617578506310e78b950b011dc3dbb5432ea.tar.gz android_packages_apps_Trebuchet-d5dbf617578506310e78b950b011dc3dbb5432ea.tar.bz2 android_packages_apps_Trebuchet-d5dbf617578506310e78b950b011dc3dbb5432ea.zip | |
resolve merge conflicts of 02aced978 to ub-launcher3-dorval-polish
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ib44ce0130b9eb01c354f18326d7d3a1eeb2c5eb8
Diffstat (limited to 'src/com/android/launcher3/InvariantDeviceProfile.java')
0 files changed, 0 insertions, 0 deletions