| commit | 6b60287ff999ba2f038560d62958c0f5b2e14ce7 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Aug 13 06:55:08 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 13 06:55:08 2015 +0000 |
| tree | 6e90c209442a8150732b70942836335ec5947429 | |
| parent | c03459cd05e175104c46b6530367750f0811a9f4 [diff] | |
| parent | 06d14c5243af84dfb2ba1a9027c9215b6d751d1e [diff] |
am 06d14c52: (-s ours) am b3852044: (-s ours) am 93d1612d: (-s ours) am 8a12d17b: (-s ours) am eea96f22: (-s ours) Import translations. DO NOT MERGE * commit '06d14c5243af84dfb2ba1a9027c9215b6d751d1e': Import translations. DO NOT MERGE