| commit | a79eea5c9722d1ee23c7b220f4c29815a1c6c0bd | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Dec 04 20:24:11 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Dec 04 20:24:11 2014 +0000 |
| tree | 21e5bbe7ae78769130a2ea2d6af9b85305f46c3a | |
| parent | a786837be8181cfb251e695a8df8a0409dd1b4aa [diff] | |
| parent | 3b05d2bd6fe7a674537dc87aade5673746c96780 [diff] |
am 3b05d2bd: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev * commit '3b05d2bd6fe7a674537dc87aade5673746c96780': Import translations. DO NOT MERGE