| commit | 386b225600f0f17181c58c82062a9bbbb9bcc22c | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Oct 16 03:33:49 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 16 03:33:49 2014 +0000 |
| tree | 2296251a090cfd0e5d49d96250a25158fba58332 | |
| parent | f2932c2f86f6ec28a3cf57d6ab06595dd74d2a8a [diff] | |
| parent | c1c44c1bff8fcdc12b6815c87b5615dae31f9a9f [diff] |
am c1c44c1b: (-s ours) am 79469425: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit 'c1c44c1bff8fcdc12b6815c87b5615dae31f9a9f': Import translations. DO NOT MERGE