2 Commits

Author	SHA1	Message	Date
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
Roozbeh Pournader	11d8893745	Rename language+country resources to just language ... Bug: 26496609 Test: none Change-Id: Ic9c49ce5df386d7e2a81991adb137c7525aa77d4	2017-01-10 21:32:30 -08:00