commit | a32469694cb7838f1eaf5cc3b1b1485b355f3c0c | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Sat Sep 14 20:32:16 2013 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Sat Sep 14 20:32:16 2013 -0700 |
tree | cb963778923ae1e29c629bdf8d9bf3524aa72dc3 | |
parent | e54b83b0eec55e649d9308169902865991d6827a [diff] | |
parent | db0f02cba92f7296e90d1ed9ed07d266c99ca96a [diff] |
am db0f02cb: (-s ours) am 75d888b1: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit 'db0f02cba92f7296e90d1ed9ed07d266c99ca96a': Import translations. DO NOT MERGE