| commit | 59de17821bf8e685703891c86e794b92de44b312 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Nov 21 11:01:47 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Nov 21 11:01:47 2013 -0800 |
| tree | 6f34b07cc337a34ee3ceccab31a47297df1c7368 | |
| parent | f2a2105ec6c11d89a0df6e78aad0fc465a34d1ae [diff] | |
| parent | 8886d1d0f294a982c6979d5176b4c832f471b563 [diff] |
am 8886d1d0: (-s ours) am c2f96fae: (-s ours) Import translations. DO NOT MERGE * commit '8886d1d0f294a982c6979d5176b4c832f471b563': Import translations. DO NOT MERGE