| commit | c26c08c15b48df9139c4790f42e6d78f582e7d26 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Tue Oct 21 00:13:35 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 21 00:13:35 2014 +0000 |
| tree | fcde179dddae08e7b0ce69f8b5b72c1845689c91 | |
| parent | cded4a15316352ed7e38dd47c70bded21f94adb4 [diff] | |
| parent | ffdc6e118ad32361a5e50a96e2d0b66baac9fd37 [diff] |
am c34db2e2: (-s ours) am 133d6e32: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit 'c34db2e255b7012a3422eeee00420c1d03ed8ee0': Import translations. DO NOT MERGE