commit | 2dabb804e21be03aa930016b87d40bce00f22366 | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Thu Sep 18 18:10:11 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 18 18:10:11 2014 +0000 |
tree | 92d7e05141833f6971e337afd9ebee657f51377b | |
parent | df258d2018e2c4ac8f57a3ed7b7363dde547cdb6 [diff] | |
parent | 0b34f73b684e925da1165e5895ebafe290dddc15 [diff] |
am 0b34f73b: (-s ours) am d876e29e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '0b34f73b684e925da1165e5895ebafe290dddc15': Import translations. DO NOT MERGE