| commit | 0af511d0471b713b1f715ee5f97927505dc57643 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Nov 17 14:30:12 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Nov 17 14:30:12 2014 +0000 |
| tree | d5f09e9391a88a570e48bf43c1e51ca96b687fb1 | |
| parent | 92112f811c5aa389a662a35e4bb4464fe6a4e339 [diff] | |
| parent | 56dd7196cfe08993feddd431cabd2b001ef2098c [diff] |
am 56dd7196: (-s ours) am 22720b1d: (-s ours) Import translations. DO NOT MERGE * commit '56dd7196cfe08993feddd431cabd2b001ef2098c': Import translations. DO NOT MERGE