Merge "Make EXTRA_SHOW_MENU visible to Settings so StorageSettings can use it"...
Merge "Make EXTRA_SHOW_MENU visible to Settings so StorageSettings can use it" into nyc-dev am: 88545ce4
am: 7d47bd49
* commit '7d47bd49':
Change-Id: If336094eb98eb3983adec65a2950e854a6b8a64c