OSDN Git Service

Merge "Fixed an issue where the shelf could be hidden" into oc-dr1-dev
authorSelim Cinek <cinek@google.com>
Mon, 3 Jul 2017 10:53:14 +0000 (10:53 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 3 Jul 2017 10:53:14 +0000 (10:53 +0000)
am: fdc84a13a2

Change-Id: I6c90944ad0db3d309210f1df1d0a1c33bc13cc71


Trivial merge