summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBaligh Uddin <baligh@google.com>2014-05-13 23:48:58 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-05-13 23:48:58 +0000
commit0b8d5bf44c55832b784577c671654482fd1732ab (patch)
tree967f2714b7c695a2c8690d8099672ae2c639bbb8
parentfe32a771ee12880ca599420342cfcad1c4522fc4 (diff)
parent040217546358deba625594e423fefdb4a618f8bd (diff)
am 04021754: (-s ours) am 44a78a43: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '040217546358deba625594e423fefdb4a618f8bd':
0 files changed, 0 insertions, 0 deletions