Merge commit '47cec9fafbef30b817ac0a8af510ac35e09ea966' into eclair-plus-aosp * commit '47cec9fafbef30b817ac0a8af510ac35e09ea966': Fix http://b/issue?id=2096107 (cosmetic issue for menus in WVGA)
Merge commit '47cec9fafbef30b817ac0a8af510ac35e09ea966' into eclair-plus-aosp * commit '47cec9fafbef30b817ac0a8af510ac35e09ea966': Fix http://b/issue?id=2096107 (cosmetic issue for menus in WVGA)