summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeoff Mendal <mendal@google.com>2014-12-10 19:25:10 +0000
committerandroid-build-merger <android-build-merger@google.com>2014-12-10 19:25:10 +0000
commit4af46d6999d0b56aff26d6c833aad66cc84401c3 (patch)
treedc1be103c25c259dde75bcd17b59dc48349fb103
parent3a426694ffa268b331c5b1fc5bb40460d6d883c5 (diff)
parentda409fea8230c49666ed634aeb7db629fb9425f3 (diff)
downloadframeworks_base-4af46d6999d0b56aff26d6c833aad66cc84401c3.zip
frameworks_base-4af46d6999d0b56aff26d6c833aad66cc84401c3.tar.gz
frameworks_base-4af46d6999d0b56aff26d6c833aad66cc84401c3.tar.bz2
am 5431d1e9: (-s ours) am 2bb00d52: (-s ours) Import translations. DO NOT MERGE
automerge: da409fe -s ours * commit 'da409fea8230c49666ed634aeb7db629fb9425f3': Import translations. DO NOT MERGE
0 files changed, 0 insertions, 0 deletions