Commit Graph

2 Commits

Author SHA1 Message Date
Geoff Mendal
7a8e8880b8 Import translations. DO NOT MERGE
Change-Id: I9ed660e4a0cb209ff3a19943b4f294fcfde307b1
Auto-generated-cl: translation import
2016-01-05 07:56:37 -08:00
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