commit | 1dbad3dea95d4411cb9abfaad0ce3b01ddd174ca | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Wed Oct 01 02:14:00 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 01 02:14:00 2014 +0000 |
tree | 956da55ebb860a9c82b63d7c445e65f4eab1ac85 | |
parent | 0e95ea7e73fb6b26d4f992926dadcd5fd3a39f9a [diff] | |
parent | ded10b3fd699d9109308e60a51412754b8ef8bd0 [diff] |
am f463804e: (-s ours) am 87afc71f: (-s ours) am 3e8b5321: (-s ours) am 9a4c67b2: (-s ours) am e9c7f420: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit 'f463804eb1643ea87b13729881f2bbf475d738d0': Import translations. DO NOT MERGE