commit | 2973d25edf5b3269d1e6620e6daaeb6220c83b39 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Mon Dec 02 23:08:02 2013 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Dec 02 23:08:02 2013 +0000 |
tree | d702ac255ec8490c66801f303c6ee205199705bf | |
parent | 9f38adc4daa3c6d887ddce98ea9953f4804cba5c [diff] | |
parent | 7f150f8676f2564df274380320bc5ea3c2e138de [diff] |
am 7f150f86: (-s ours) am 4f43824b: (-s ours) am 33c93907: (-s ours) am 99dcfed6: (-s ours) Import translations. DO NOT MERGE * commit '7f150f8676f2564df274380320bc5ea3c2e138de': Import translations. DO NOT MERGE