Automatic translation import

Change-Id: I20180a2872a0d51d1b895059e7ca3929ab65dcad
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