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