am 1a6651f6: am 6888ec00: Merge "Create donottranslate debug settings string resources file" into lmp-dev

* commit '1a6651f63603fab3b92029cd3eb3c1e818bdf5f4':
main
Tadashi G. Takaoka 2014-09-12 23:21:59 +00:00 committed by Android Git Automerger
commit e5ab941402

Diff Content Not Available