tree 88f811311388804321c7d0285e91519cea4a9b39
parent be58946330c918f7912ff318030f99acb25e6098
parent 962694db3834b20a10e7d7756470b389f418c8d8
author Clara Bayarri <clarabayarri@google.com> 1461947891 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1461947894 +0000

Merge "Make EXTRA_SHOW_MENU visible to Settings so StorageSettings can use it" into nyc-dev