| commit | 187d7cc129c19177bb570b587788321012e31885 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Oct 15 15:40:46 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 15 15:40:46 2014 +0000 |
| tree | 8fa963907c3f67735fefc7c272d03f98b5b2cfd0 | |
| parent | 3d4583dfbe9ecf30510f9e8fc3f75e40fbf929d8 [diff] | |
| parent | c95b0904c0da1a3bb4225a33149480e023f2752c [diff] |
am c95b0904: (-s ours) am 1a6aa4e7: (-s ours) Import translations. DO NOT MERGE * commit 'c95b0904c0da1a3bb4225a33149480e023f2752c': Import translations. DO NOT MERGE