commit | b214417a6e1a7cca5bac961c2b32b72d8baea2dd | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Wed Mar 04 14:08:11 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Mar 04 14:08:11 2015 +0000 |
tree | e1d01c383a2a4fc026b2d85c8582cd8faa5acc8e | |
parent | bb9360e36cea7c2af17992c1b08eedbce707962b [diff] | |
parent | 3b9e64f3265ad146da1b9f5b523c406acd041f59 [diff] |
am 3b9e64f3: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev * commit '3b9e64f3265ad146da1b9f5b523c406acd041f59': Import translations. DO NOT MERGE