summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeoff Mendal <mendal@google.com>2014-08-06 19:54:46 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-08-06 19:54:46 +0000
commit2558215ef8923c372458d18417e41adbb8619105 (patch)
tree20ee8e3fb16aa4b8d0e530a07fe8e649989d08ae
parentc5a17de5e314f6f7d9b8eb76e837c6ebc96374c7 (diff)
parentcd819ff62a1b7ba82bf07cc4c757a384fd8a1b99 (diff)
am cd819ff6: (-s ours) am 59ae58e8: (-s ours) am 7be8f310: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit 'cd819ff62a1b7ba82bf07cc4c757a384fd8a1b99': Import translations. DO NOT MERGE
0 files changed, 0 insertions, 0 deletions