OSDN Git Service

Merge "Only add icons to settings items with icons" into oc-dev
authorMatthew Fritze <mfritze@google.com>
Thu, 11 May 2017 00:20:13 +0000 (00:20 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 11 May 2017 00:20:13 +0000 (00:20 +0000)
am: ec00573139

Change-Id: I27166b54cd51b055d80a96afded31b2f55dbdb8e


Trivial merge