diff options
| author | Baligh Uddin <baligh@google.com> | 2013-10-16 18:16:14 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-16 18:16:14 -0700 |
| commit | b873a17ce7be0a9771c24999adca6964431728f6 (patch) | |
| tree | 3337e8c4680cfda58c49f2e704c4d9376ec7f00e /media/jni | |
| parent | 6155bfb788a771362d76a0d7d1c0cff1d9170ebf (diff) | |
| parent | e5f3f65827043ac7b32287a3371c33c9fb90d030 (diff) | |
| download | frameworks_base-b873a17ce7be0a9771c24999adca6964431728f6.zip frameworks_base-b873a17ce7be0a9771c24999adca6964431728f6.tar.gz frameworks_base-b873a17ce7be0a9771c24999adca6964431728f6.tar.bz2 | |
am e5f3f658: (-s ours) am 192a856d: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit 'e5f3f65827043ac7b32287a3371c33c9fb90d030':
Import translations. DO NOT MERGE
Diffstat (limited to 'media/jni')
0 files changed, 0 insertions, 0 deletions