OSDN Git Service

merged ub-launcher3-dorval, and resolved conflicts
authorHyunyoung Song <hyunyoungs@google.com>
Fri, 5 May 2017 06:05:21 +0000 (23:05 -0700)
committerHyunyoung Song <hyunyoungs@google.com>
Wed, 10 May 2017 21:16:30 +0000 (14:16 -0700)
commit93d0b87153a094fd4de1a302ce501a4e7c93befb
tree8453c030e0ca14fc1cba9156eaa758c0ded3290e
parent1e92b1fd0582adeea533b05d9423907239ca9069
parent8dd56b7e44d3d51ef621ef2096f807f97396db01
merged ub-launcher3-dorval, and resolved conflicts
Bug: 36904684
Bug: 37929893
Bug: 36068989

Merged-In: I3da7113926cdcb933707b3864c4334223c11e25b
Merged-In: If9b11b212852cb1048d54db2224dab4acf2d93e0

Test: make -j 32 dist checkbuild

Change-Id: I7e12afdf66a892654a06b77f7fc625a93554d1e7
29 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
tests/Android.mk