commit | 75fd7bfa49c0da3a7dd5582a060e8d502a6cd0ce | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Wed Oct 15 15:47:52 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 15 15:47:52 2014 +0000 |
tree | b69dae54f3e411e78ed57929ab933134a9238639 | |
parent | dec40327d99fa0d8c913ea4553247b635c740b98 [diff] | |
parent | afa318ab100e3869a5da7a4438d94ec6a80e813a [diff] |
am afa318ab: (-s ours) am 9cf8056e: (-s ours) am a869e372: (-s ours) am cb5b0dd3: (-s ours) Import translations. DO NOT MERGE * commit 'afa318ab100e3869a5da7a4438d94ec6a80e813a': Import translations. DO NOT MERGE