tree 86855f3544664333339a803fef6b1c78a7cd08d5
parent 9886239b47d584a37b30df88f00015a14df29fa7
parent 07283e78513e462a3e0d8c510d993a777a7e7ae2
author Sudheer Shanka <sudheersai@google.com> 1463002400 +0000
committer android-build-merger <android-build-merger@google.com> 1463002400 +0000

Merge "Merge "Move spinner_dropdown_restricted_item to Settings." into nyc-dev am: f7a2afb4fc am: 24d8e86219" into nyc-mr1-dev-plus-aosp
am: 07283e7851

* commit '07283e78513e462a3e0d8c510d993a777a7e7ae2':

Change-Id: Ia6094f04954df561958cde59cb459b35bc365c48