commit | 7789a733785b7b88ac8b44987152132c6efc54e2 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Wed Mar 04 14:04:35 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Mar 04 14:04:35 2015 +0000 |
tree | eee8ced726d2fff8bc47b6b38bf747dfef68c4d4 | |
parent | 1d2f000d415eaaee6870382550a9ce039df776eb [diff] | |
parent | 9de4a2e4e5d8f5d0f5b28d65d73e2917831257f0 [diff] |
am 9de4a2e4: (-s ours) Merge "Import translations. DO NOT MERGE" * commit '9de4a2e4e5d8f5d0f5b28d65d73e2917831257f0': Import translations. DO NOT MERGE