summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBaligh Uddin <baligh@google.com>2014-03-25 17:22:44 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-25 17:22:44 +0000
commit6babdc36cff3321281295b79ca6985e27f8fdb7f (patch)
tree7c67abb754a48610ecfa88fb3dadaa3626211644
parent258bd644e5fc4e9941d5a0320f527f59d5fbc962 (diff)
parent4647d3a9d112c6779e70d622e4a6035036272098 (diff)
am a49b916a: (-s ours) am d838ebc6: (-s ours) am bc01c0e8: (-s ours) am 45ab8271: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit 'a49b916a14e0e6dc543388c1ac345c6f67364a5f': Import translations. DO NOT MERGE
0 files changed, 0 insertions, 0 deletions