| commit | c5fdbe8271f6f34baa27521d6146fbc6e7429a58 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Dec 17 14:37:24 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Dec 17 14:37:24 2014 +0000 |
| tree | 19c9e17c3de2e599b1b47afd051469d88a5c0562 | |
| parent | e1ea5a5c8e4ed8b327603958492778550059664a [diff] | |
| parent | 3a92fb2693925f804964914728f40eb94c0c2bfb [diff] |
am 3a92fb26: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev * commit '3a92fb2693925f804964914728f40eb94c0c2bfb': Import translations. DO NOT MERGE