| commit | 76bdaaded39e961666aa9a43658489800a865e9f | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Oct 30 20:58:32 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 30 20:58:32 2014 +0000 |
| tree | f3fca2853aded72a369e8cdb84625a32dca7d1ac | |
| parent | a536fb436c69f5f8eb5c0cd64b34cae4e7b1579e [diff] | |
| parent | fe9aed1afee625e5b5ce5343d8d7cee7fd0eb4fb [diff] |
am 23b8e938: (-s ours) am 4fce1171: (-s ours) am f543d669: (-s ours) Import translations. DO NOT MERGE * commit '23b8e938f0697e7ed85981bd950daee461286d01': Import translations. DO NOT MERGE