Bug 922713 - Permission request button text.
Bug 925685 - Make test keyboard app change its window height correctly, r=timdream
Merge pull request #12737 from alivedise/bugzilla/922713/permission-dialog-button-text

Bug 922713 - Permission request button text, r=timdream
Merge pull request #12792 from luke-chang/925685_test_keyboard_app_height

Bug 925685 - Make test keyboard app change its window height correctly. r=timdream.