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: 9c3cebf7
am: dc2340ff
* commit 'dc2340ff':
Make EXTRA_SHOW_MENU visible to Settings so StorageSettings can use it
Change-Id: Ibb1b1deda5fd07d2234077e61cab0741cc999f92