OSDN Git Service

Merge "Inline Controls hide Settings button when no appropriate link." into oc-dev
authorGeoffrey Pitsch <gpitsch@google.com>
Wed, 5 Apr 2017 15:25:16 +0000 (15:25 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 5 Apr 2017 15:25:16 +0000 (15:25 +0000)
am: 18cbccbfb0

Change-Id: Ic0aff571bdb29570e2e5b56a5ce76c75d27f69e3


Trivial merge