am aee3ea8f: am 55fa5332: am 03698e68: Merge "Change the test case about SCREENLAYOUT_LONG depending whether the navigation bar is displayed or not."
* commit 'aee3ea8f':
Change the test case about SCREENLAYOUT_LONG depending whether the navigation bar is displayed or not.