| commit | 0691c857b25a4ed0dd9f2080a91c98d176734f66 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jun 01 18:17:45 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 01 18:17:45 2015 +0000 |
| tree | c8c6f773cb83425081fc79f8a2b234bf8b3fb014 | |
| parent | 3ff0d500128d1630da672e1b4470ff380a88e857 [diff] | |
| parent | 2e0be060b9f1a9ac5014ba73080a43bbd815fa9d [diff] |
am 2e0be060: (-s ours) am 37e1df34: (-s ours) am efaf2ac0: (-s ours) Import translations. DO NOT MERGE * commit '2e0be060b9f1a9ac5014ba73080a43bbd815fa9d': Import translations. DO NOT MERGE