summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeoff Mendal <mendal@google.com>2014-12-04 21:47:03 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-12-04 21:47:03 +0000
commit040db769fc9c31a95ae422c549bde3dd6986fd03 (patch)
tree7c363266fd535a21f7db6815f3fd4dcbe60344e1
parentea8d08ac8f147535caec8226793eb2577ccda15b (diff)
parent2145b3925a5c965e8c07461dd6e1725f8fcd1379 (diff)
am 2145b392: (-s ours) am 7b79c351: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '2145b3925a5c965e8c07461dd6e1725f8fcd1379': Import translations. DO NOT MERGE
0 files changed, 0 insertions, 0 deletions