commit | 2c2430222aab31abea0d393b98c02a1ffcf54c19 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Mon Oct 06 19:17:13 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 06 19:17:13 2014 +0000 |
tree | 18c63931a4998cbe135683e76b2518eeca6c579b | |
parent | 86c7256101302e337305eae55cbfaaba66f71525 [diff] | |
parent | 94fe7134b47f90cbbdb28a299b8ddbd8ac547f87 [diff] |
am 94fe7134: (-s ours) Import translations. DO NOT MERGE * commit '94fe7134b47f90cbbdb28a299b8ddbd8ac547f87': Import translations. DO NOT MERGE