OSDN Git Service

merged ub-launcher3-dorval, and resolved conflicts
authorHyunyoung Song <hyunyoungs@google.com>
Wed, 31 May 2017 18:46:06 +0000 (11:46 -0700)
committerHyunyoung Song <hyunyoungs@google.com>
Wed, 31 May 2017 18:48:47 +0000 (11:48 -0700)
commit69a49c1d24c5d773c8dab934f5bf925694ee9270
treee841eae4669f86a4fbc5d8deb5e9d2e36b869d74
parent93d0b87153a094fd4de1a302ce501a4e7c93befb
parent8b6ea60facc33c973d1a8c432b91bbade851415c
merged ub-launcher3-dorval, and resolved conflicts
Test: $ make -j 32 dist checkbuild
Bug: 62196967

Change-Id: Ibdcdde25cb117574549404348105d49348e79bea
28 files changed:
res/values-az/strings.xml
res/values-bn/strings.xml
res/values-bs/strings.xml
res/values-eu/strings.xml
res/values-gl/strings.xml
res/values-gu/strings.xml
res/values-hy/strings.xml
res/values-is/strings.xml
res/values-ka/strings.xml
res/values-kk/strings.xml
res/values-km/strings.xml
res/values-kn/strings.xml
res/values-ky/strings.xml
res/values-lo/strings.xml
res/values-mk/strings.xml
res/values-ml/strings.xml
res/values-mn/strings.xml
res/values-mr/strings.xml
res/values-my/strings.xml
res/values-ne/strings.xml
res/values-pa/strings.xml
res/values-si/strings.xml
res/values-sq/strings.xml
res/values-ta/strings.xml
res/values-te/strings.xml
res/values-ur/strings.xml
res/values-uz/strings.xml
src/com/android/launcher3/LauncherModel.java