tree 119066699609122b06c278f2a2d81cf70184052b
parent f58b595b6f25ceb57163e23c829996e2818494e1
parent 853240ece1b1fa88b97f33491bb9731e83953110
author Michael Bestas <mikeioannina@gmail.com> 1433875971 +0000
committer Gerrit Code Review <gerrit@cyanogenmod.org> 1433875971 +0000

Merge "Automatic translation import" into cm-12.1