commit | e5ab941402b979091afe337523ef64b49791896b | [log] [tgz] |
---|---|---|
author | Tadashi G. Takaoka <takaoka@google.com> | Fri Sep 12 23:21:59 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 12 23:21:59 2014 +0000 |
tree | e4f48b0b9fba648758dfea0d3696b74e9df2faea | |
parent | b4499a1e0e65413319b233076c4d2276a7c7492a [diff] | |
parent | 1a6651f63603fab3b92029cd3eb3c1e818bdf5f4 [diff] |
am 1a6651f6: am 6888ec00: Merge "Create donottranslate debug settings string resources file" into lmp-dev * commit '1a6651f63603fab3b92029cd3eb3c1e818bdf5f4':