| commit | f6ee5dbc5efc90467dd46c5317807676fdaf8ae6 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Feb 12 23:22:38 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Feb 12 23:22:38 2015 +0000 |
| tree | 52e9edfa13b55ca5cecef2229941cc72dae7badb | |
| parent | 1be4b702f531363903b46a88fc3d1603fb19c3ef [diff] | |
| parent | fabfcfd97e37b1cc194fa0e9f6db3268e1a2ae43 [diff] |
am fabfcfd9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev * commit 'fabfcfd97e37b1cc194fa0e9f6db3268e1a2ae43': Import translations. DO NOT MERGE