| commit | 5fbd56ebaea7703af6a611ecd52814b93b44151a | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Sun Oct 19 22:54:54 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sun Oct 19 22:54:54 2014 +0000 |
| tree | 9d30c64fb9c34dcc00486e5ad67f9e8696ff8ba9 | |
| parent | 7f56fa18ebf2d1b0ffcb359f9597484f8f52c80c [diff] | |
| parent | 7c6e3e015de6979579da7178f1488a8b61d5445e [diff] |
am 7c6e3e01: (-s ours) am 700ea8bb: (-s ours) am 6912dc5f: (-s ours) am ffd0f4d5: (-s ours) am 6f1de7e5: (-s ours) am cf1c95ec: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '7c6e3e015de6979579da7178f1488a8b61d5445e': Import translations. DO NOT MERGE