tree ca175304df3e9ac6cb444e61c95a41cc8fdf3d71
parent 78526c33410584011f502ca5bb379663565fbb14
parent fdc84a13a25c205c87b5d5dff92244ae8c295759
author Selim Cinek <cinek@google.com> 1499079194 +0000
committer android-build-merger <android-build-merger@google.com> 1499079194 +0000

Merge "Fixed an issue where the shelf could be hidden" into oc-dr1-dev
am: fdc84a13a2

Change-Id: I6c90944ad0db3d309210f1df1d0a1c33bc13cc71