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)
commitab13b378c91265c535fc87180c5797e701cf710e
tree0727ca820b8c6efbe002d7c7d11e710eddcdb944
parent16bc088c4e104bafae8ceaf74eec7263e4c290e5
parentec00573139978e7dce82c9dd1be8dab45b3b2fd5
Merge "Only add icons to settings items with icons" into oc-dev
am: ec00573139

Change-Id: I27166b54cd51b055d80a96afded31b2f55dbdb8e