commit | 321c2d47771961de3b049afbfeebbc890b6cc20d | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Wed Jul 15 17:52:38 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 15 17:52:38 2015 +0000 |
tree | 5790008aa949ab3f982a6b6f114152e972156e6b | |
parent | 0f87e8d03e0355cab82cd57de1c0c614ca14d5ed [diff] | |
parent | 1074d6d44abd1793b8a9532546d05f8c01264395 [diff] |
am 1074d6d4: (-s ours) Import translations. DO NOT MERGE * commit '1074d6d44abd1793b8a9532546d05f8c01264395': Import translations. DO NOT MERGE