commit | a4fdfc6732741676b86ec4a166ae6afefdd97236 | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Wed Sep 24 18:01:22 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 24 18:01:22 2014 +0000 |
tree | ecfe4b336de47f713352654de9d57795cf21cbfd | |
parent | 60cee97336aca000bd94b392ef855dbd0b2891a9 [diff] | |
parent | 0e6a9182a95d7e829ca73d68fd2a6b75f05042ea [diff] |
am 0e6a9182: (-s ours) am 83f9d183: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev * commit '0e6a9182a95d7e829ca73d68fd2a6b75f05042ea': Import translations. DO NOT MERGE