| commit | d33f7d6a6201edb0f15f25511c9c3323b67a295a | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Oct 16 00:42:05 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 16 00:42:05 2014 +0000 |
| tree | 57314dd55af4d5ce881018e1a2a99640007177cf | |
| parent | 9afd56e08d872c6786cd622488c926e6b7a5524a [diff] | |
| parent | 4909c412fa8c495f1abba3c7d3fe0c32f08934db [diff] |
am 4909c412: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '4909c412fa8c495f1abba3c7d3fe0c32f08934db': Import translations. DO NOT MERGE