| commit | 813e1bfec1fc03a9d87b4cc0fa2d6931f3485eec | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Nov 03 21:11:42 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Nov 03 21:11:42 2014 +0000 |
| tree | 308bfe160bdd2b8f1774e6606c2f4a2d2a9732cd | |
| parent | 46fadb5f585a2ee447bc6997216d3db70571217c [diff] | |
| parent | 13ff526ba803087944fc857ca2dfb3982ff25a65 [diff] |
am 13ff526b: (-s ours) Import translations. DO NOT MERGE * commit '13ff526ba803087944fc857ca2dfb3982ff25a65': Import translations. DO NOT MERGE