diff options
| author | Baligh Uddin <baligh@google.com> | 2014-08-15 16:22:19 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-08-15 16:22:19 +0000 |
| commit | 905f66806672b229dc270d0c56f435da28dfca9c (patch) | |
| tree | 4bad6f467acfcf0ff51177aa92217cdc23c4d7cb /res | |
| parent | 7e683b024f5be78000d4b2a55de6b513a94e3960 (diff) | |
| parent | f62cf88d0464c3741319f674bfb0836a08308c88 (diff) | |
am f62cf88d: (-s ours) am 4069b050: (-s ours) am 2ba60e4a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit 'f62cf88d0464c3741319f674bfb0836a08308c88':
Import translations. DO NOT MERGE
Diffstat (limited to 'res')
0 files changed, 0 insertions, 0 deletions