| commit | afa318ab100e3869a5da7a4438d94ec6a80e813a | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Oct 15 15:44:20 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 15 15:44:20 2014 +0000 |
| tree | 8fa963907c3f67735fefc7c272d03f98b5b2cfd0 | |
| parent | 187d7cc129c19177bb570b587788321012e31885 [diff] | |
| parent | 9cf8056e62fb390049e93ecb09ab874d84c39369 [diff] |
am 9cf8056e: (-s ours) am a869e372: (-s ours) am cb5b0dd3: (-s ours) Import translations. DO NOT MERGE * commit '9cf8056e62fb390049e93ecb09ab874d84c39369': Import translations. DO NOT MERGE