| commit | 93d67f65ac2d154a29dc7afdc6ae039b98fd07fd | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Sun Oct 19 22:29:20 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sun Oct 19 22:29:20 2014 +0000 |
| tree | 12534000ff0e4eda41742040b9324d6e435a9d0b | |
| parent | ffd0f4d5e753c936455a7bedd6c6d83912ce6ae0 [diff] | |
| parent | 6949eb15668dd099958fe7e00afcba448bb09aa1 [diff] |
am 6949eb15: (-s ours) am 815b31f9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '6949eb15668dd099958fe7e00afcba448bb09aa1': Import translations. DO NOT MERGE