commit | e6ce8d2a9bfc4c42f93961f924c59b3aba40e543 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Wed Jul 15 21:54:47 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 15 21:54:47 2015 +0000 |
tree | c9a145c509081fd1c4d99c299dc55c7bf9a77a09 | |
parent | 97910c8fc579f17e6f2fe464a55b7ad47681252f [diff] | |
parent | 511805d10cc96d69f96bdb6aa3475385d53367ed [diff] |
am f998875f: (-s ours) am 3e2d53b0: (-s ours) Import translations. DO NOT MERGE * commit 'f998875f666420fc6dc7b65b56773d43ee72de52': Import translations. DO NOT MERGE