| commit | 8eada9d964cf20993615a48ec50ff364050bb2e9 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Nov 03 22:35:49 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Nov 03 22:35:49 2014 +0000 |
| tree | 5611785acb5387cfe3ff77b2e50c7d99a5bb3e62 | |
| parent | 8a463d55b81008ddc8fb1c3fd0c83ad5678f6c51 [diff] | |
| parent | c4127f91eb9c1f46e2c1b3d1f6184926817ed866 [diff] |
am c4127f91: (-s ours) am 46fadb5f: (-s ours) Import translations. DO NOT MERGE * commit 'c4127f91eb9c1f46e2c1b3d1f6184926817ed866': Import translations. DO NOT MERGE