Automatic translation import

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