| commit | 929b6ea123ad80f5839bc258ab5ef85dd50ed33e | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jan 19 16:47:56 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jan 19 16:47:56 2015 +0000 |
| tree | 055b326db7d391964f5e52900e3c0e14bb2d2e29 | |
| parent | 35ac3fc4f067aa6c06261c723b0f589c0f4caf00 [diff] | |
| parent | 8c3a52ea2028f76b8a2acc11d02bca0f8efb3527 [diff] |
am a220cc11: (-s ours) am fde1bf36: (-s ours) Import translations. DO NOT MERGE * commit 'a220cc11f025d8649f6c95fd27327c99e3bbbc36': Import translations. DO NOT MERGE