Mark Salyzyn 94ab88228e resolve merge conflicts of f3cc23524f to mnc-dr2-dev-plus-aosp. ...

Change-Id: I8fe1e5b4797405b2f470fb3fa538bd3728048f00

2015-12-28 10:49:04 -08:00

..

arrays.xml

resolve merge conflicts of f3cc23524f to mnc-dr2-dev-plus-aosp.

2015-12-28 10:49:04 -08:00

strings.xml

Import translations. DO NOT MERGE

2015-11-04 12:11:39 -08:00