| commit | e21824491ee47ecc35376b9fd909a07416276f29 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Dec 04 15:17:53 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Dec 04 15:17:53 2014 +0000 |
| tree | 6ab05b26b4c945b338d0ae8ef8a0e5e8971d153e | |
| parent | 53e8940b94a7b508659b84fd9037f922f1d4a50f [diff] | |
| parent | 3f5fd1febae34976bdc3f03b44eaec99bbf9703b [diff] |
am 3f5fd1fe: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit '3f5fd1febae34976bdc3f03b44eaec99bbf9703b': Import translations. DO NOT MERGE