summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBaligh Uddin <baligh@google.com>2014-03-20 14:11:00 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-20 14:11:00 -0700
commita4ce428848d61b5a2e3508627840fd6dfe2ad478 (patch)
tree685d946ef5d01ef82f66078eec5fd5b5d35b54a3
parentf22fdd0bc2fa911fda72ef23cba3e53315530bff (diff)
parent0b41f0f32c66cd7d58d2635d6b2434c467b82b2a (diff)
am 0b41f0f3: (-s ours) am ad1d1aac: (-s ours) am 7b9c7ea0: (-s ours) am 1c0e52d6: (-s ours) am c1f2a213: (-s ours) am ea8ec3cd: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '0b41f0f32c66cd7d58d2635d6b2434c467b82b2a': Import translations. DO NOT MERGE
0 files changed, 0 insertions, 0 deletions