diff options
| author | Baligh Uddin <baligh@google.com> | 2013-09-12 09:21:39 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-09-12 09:21:39 -0700 |
| commit | 6f6771dce814492cfb206e01010ce462dcf23c65 (patch) | |
| tree | ffd5f80d4be39ed235242d00abfe4a2acdd825e5 /proguard.flags | |
| parent | 48414483a29b3de5d63edeb51ca76a943bd723b6 (diff) | |
| parent | 294de01646354fa7fcb2c4148cacf72256907da9 (diff) | |
am 294de016: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '294de01646354fa7fcb2c4148cacf72256907da9':
Import translations. DO NOT MERGE
Diffstat (limited to 'proguard.flags')
0 files changed, 0 insertions, 0 deletions