diff options
| author | Baligh Uddin <baligh@google.com> | 2013-10-08 07:05:43 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-08 07:05:43 -0700 |
| commit | 61fe1fc72f1ee1c8325b1565de1061404a7eec89 (patch) | |
| tree | bd56e96fcfc35737c30abe1c82fb9134dfcc06d5 /res | |
| parent | 374b68371bf0c51de8871f4fe22d3d37f75daf52 (diff) | |
| parent | cf859e0f2a33d58a4264a2291e0fb2b631e6d1f7 (diff) | |
am cf859e0f: (-s ours) am ff644e0c: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit 'cf859e0f2a33d58a4264a2291e0fb2b631e6d1f7':
Import translations. DO NOT MERGE
Diffstat (limited to 'res')
0 files changed, 0 insertions, 0 deletions