summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeoff Mendal <mendal@google.com>2015-08-27 11:21:05 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-08-27 11:21:05 +0000
commit60c3268e8f5917b1d983bdcc3c6f4069377d43a1 (patch)
tree8924d31ff2ecb8b544ab35dab62f515aac397156
parent0dc65d746f5ba86f5181c66545fa72ac534a3b18 (diff)
parent0dacc415aae90c87321329c1e59463c76a0a6e82 (diff)
am 0dacc415: (-s ours) am eb0be29e: (-s ours) Import translations. DO NOT MERGE
* commit '0dacc415aae90c87321329c1e59463c76a0a6e82':
0 files changed, 0 insertions, 0 deletions