commit | 1870e32a7170ede44eef5b467b2a37fa473bd087 | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Fri Sep 19 16:03:24 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 19 16:03:24 2014 +0000 |
tree | 0b348bce5dd6a997b603da189249965175096b42 | |
parent | f0fd96d967732253cf0185909096349aba8c9684 [diff] | |
parent | 778f5c92aaa578027fc24bfeca039b5eaa7ab80c [diff] |
am bc578bab: (-s ours) am fdb8d347: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev * commit 'bc578bab1d5576e6b0fabff8a7d7c6836ffd0940': Import translations. DO NOT MERGE