diff options
| author | Jon Miranda <jonmiranda@google.com> | 2017-08-22 13:42:47 -0400 |
|---|---|---|
| committer | Jon Miranda <jonmiranda@google.com> | 2017-08-22 13:52:19 -0400 |
| commit | dff92fe1aa90dfad1cce228ee140a70ab7a365b2 (patch) | |
| tree | d079f20d40107acf9056d049817318e85ec44bbb /src/com/android/launcher3/dragndrop/PinShortcutRequestActivityInfo.java | |
| parent | 9623a6f891a31f1285f360baf77beb335613e7f5 (diff) | |
| parent | 78356a542e14ad6eefd5288506d1e53f601257f6 (diff) | |
| download | android_packages_apps_Trebuchet-dff92fe1aa90dfad1cce228ee140a70ab7a365b2.tar.gz android_packages_apps_Trebuchet-dff92fe1aa90dfad1cce228ee140a70ab7a365b2.tar.bz2 android_packages_apps_Trebuchet-dff92fe1aa90dfad1cce228ee140a70ab7a365b2.zip | |
merged ub-launcher3-dorval-polish2, and resolved conflicts
Conflicts:
res/values-be/strings.xml
res/values-et/strings.xml
res/values-ms/strings.xml
Bug: 64937210
Test: flashed img
Change-Id: I28557d652cc5a547f8b94a60a41f381a5af2fa84
Diffstat (limited to 'src/com/android/launcher3/dragndrop/PinShortcutRequestActivityInfo.java')
0 files changed, 0 insertions, 0 deletions