| commit | 70aa270e59278bb324dfac855df701350729589d | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Oct 30 18:39:18 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 30 18:39:18 2014 +0000 |
| tree | c28086db4b26c39429314fef0a9f334b0f67d43e | |
| parent | fe930d6c8f5d5f7b104d9593a5a1a5a898ea776f [diff] | |
| parent | d7e9aee5288f14f5fe35440c05e716594cd3bc9b [diff] |
am 2351685d: (-s ours) am 6c94eab2: (-s ours) Import translations. DO NOT MERGE * commit '2351685d7ba79301bd0eff2ef77cdb2b4740a937': Import translations. DO NOT MERGE