OSDN Git Service

Merge "Hide "Magnify with button" if no navbar is shown" into oc-dev
authorCasey Burkhardt <caseyburkhardt@google.com>
Tue, 18 Apr 2017 00:21:04 +0000 (00:21 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 18 Apr 2017 00:21:04 +0000 (00:21 +0000)
am: 65523b9cb0

Change-Id: I981cbc677a5b1b000c6734fc8f12d4af681f4268


Trivial merge