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