summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Geoff Mendal <mendal@google.com> 2015-08-01 17:06:29 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2015-08-01 17:06:29 +0000
commit9fd7ac26e3d87a1444a2bb8610fd001bd191e2fd (patch)
tree43b0a7b9a08e7b3b4d7e3bc7e09b78256181a9e5
parent71ed8648e2c2b5b2ee4d74fcaf6be2b3f4e63388 (diff)
parented133f9c4a907f111ef639fcd56ddad865c0fcd4 (diff)
am ed133f9c: (-s ours) am b2323582: (-s ours) am 335ffd32: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit 'ed133f9c4a907f111ef639fcd56ddad865c0fcd4': Import translations. DO NOT MERGE
0 files changed, 0 insertions, 0 deletions