| commit | ee257163891bc46f657a670e3852a651ae974231 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Sun Oct 19 22:54:56 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sun Oct 19 22:54:56 2014 +0000 |
| tree | 9d30c64fb9c34dcc00486e5ad67f9e8696ff8ba9 | |
| parent | 5fbd56ebaea7703af6a611ecd52814b93b44151a [diff] | |
| parent | 69d3d33fb0baeed6b93fc7f28c7a9a042f345361 [diff] |
am 69d3d33f: (-s ours) am 5aa08a0b: (-s ours) am 821db737: (-s ours) am 93d67f65: (-s ours) am 6949eb15: (-s ours) am 815b31f9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '69d3d33fb0baeed6b93fc7f28c7a9a042f345361': Import translations. DO NOT MERGE