Automatic translation import

Change-Id: I74ceb10f94c6c0e18104a687779954198a214ac7
Merge branch 'cm-11.0' of git://github.com/CyanogenMod/android_packages_apps_Browser into cm-11.0
Merge branch 'cm-11.0' of https://github.com/temasek/android_packages_apps_Browser into HEAD