| commit | b7c3b5b1c35e18dea084c2afa937f6774b0f12ed | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Oct 20 21:19:29 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 20 21:19:29 2014 +0000 |
| tree | 697ee617f71dc93b36c0225d67ab8a074b5ff712 | |
| parent | 35982c3bda2b601e7afecfd7af3d65fe7ae356cc [diff] | |
| parent | 21bb9e43e203a6122d3778f8b0cd96779fb19b23 [diff] |
am 21bb9e43: (-s ours) am be1f17ed: (-s ours) am 0dffb211: (-s ours) Import translations. DO NOT MERGE * commit '21bb9e43e203a6122d3778f8b0cd96779fb19b23': Import translations. DO NOT MERGE