| commit | ebfb3a2e93dda7a8c9ab554378d211ec17df627c | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Mar 17 17:51:02 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 17 17:51:02 2014 +0000 |
| tree | 2744eb63dbb3598dc34cdfa742eb6c5a90592a49 | |
| parent | 069a51d65c2295cd1677f8bec79a82365ce8a9e7 [diff] | |
| parent | e989e14f33ae3d26389456fa6b39687c3e79a5a9 [diff] |
am e989e14f: (-s ours) am 5c6d6c38: (-s ours) am dafd9fc8: (-s ours) Import translations. DO NOT MERGE * commit 'e989e14f33ae3d26389456fa6b39687c3e79a5a9': Import translations. DO NOT MERGE