commit | a69721a1b31396eca9824153c9b98b6a5a66a9ba | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Mon Mar 23 22:41:52 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 23 22:41:52 2015 +0000 |
tree | 48850f33184b22e8760dec79835bf064f986f749 | |
parent | 53760e4ca6e99373b9b49dc7754f1a891aa0f3c2 [diff] | |
parent | fbda111f2d53a57322172b0e30b491afb3d32193 [diff] |
am fbda111f: (-s ours) am efd1d365: (-s ours) am 7a598057: (-s ours) Import translations. DO NOT MERGE * commit 'fbda111f2d53a57322172b0e30b491afb3d32193':