Hyunyoung Song 6b140bed44 merged ub-launcher3-dorval, and resolved conflicts ...

Bug: 36904684
Bug: 37929893
Bug: 36068989

Test: make -j 32 dist checkbuild

Change-Id: I3da7113926cdcb933707b3864c4334223c11e25b

2017-05-10 16:51:21 -07:00

..

strings.xml

merged ub-launcher3-dorval, and resolved conflicts

2017-05-10 16:51:21 -07:00