commit | acad157fed09c9cbd39f5b8ce50bf6ec51faf048 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Wed Dec 17 14:37:12 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Dec 17 14:37:12 2014 +0000 |
tree | d46ff1466df361fa4d90aca58b62e0d5b2a2bf77 | |
parent | 2097056679b2b138f3c529170c3e12804e198d5f [diff] | |
parent | e1ea5a5c8e4ed8b327603958492778550059664a [diff] |
am e1ea5a5c: (-s ours) am b4ff0269: (-s ours) am 3b08bdec: (-s ours) Import translations. DO NOT MERGE * commit 'e1ea5a5c8e4ed8b327603958492778550059664a': Import translations. DO NOT MERGE