| commit | 1d6f6d210511c4cbbe599225a66ad9742bbc53c5 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Apr 29 13:52:58 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 29 13:52:58 2015 +0000 |
| tree | e82b1665215d015fe56ee8d9f7b4af400aca290f | |
| parent | af6cd330d0f28e5934be61b479c8726b0b1c7412 [diff] | |
| parent | 9ab996429b7b27b41863e2c750c47988245dfb3a [diff] |
am 9ab99642: (-s ours) am 99e36031: (-s ours) Import translations. DO NOT MERGE * commit '9ab996429b7b27b41863e2c750c47988245dfb3a': Import translations. DO NOT MERGE