commit | 689f06f895fd1539dd885d1f88dae691cd4bc100 | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Sun Aug 17 13:58:46 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Sun Aug 17 13:58:46 2014 +0000 |
tree | 12f15bd120cd8f18e46713dbfcc426b6b929e016 | |
parent | 05bccec1fb8f759336cbfcf6e08b90ac8b9a20e1 [diff] | |
parent | c27c397ec315b530992a8896b3aecd29704a5422 [diff] |
am 006f4664: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '006f4664abd04c079db2ad793f79feb820ccade5': Import translations. DO NOT MERGE