Hyunyoung Song 69a49c1d24 merged ub-launcher3-dorval, and resolved conflicts ...

Test: $ make -j 32 dist checkbuild
Bug: 62196967

Change-Id: Ibdcdde25cb117574549404348105d49348e79bea

2017-05-31 11:48:47 -07:00

..

strings.xml

merged ub-launcher3-dorval, and resolved conflicts

2017-05-31 11:48:47 -07:00