OSDN Git Service

Merge "Move icon resources into SettingsLib for phone buddy" into oc-dr1-dev am:...
authorMatthew Fritze <mfritze@google.com>
Sat, 22 Jul 2017 03:50:53 +0000 (03:50 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 22 Jul 2017 03:50:53 +0000 (03:50 +0000)
am: 0e7fc49139

Change-Id: I45ce0a0dbe7605eca86344e507042d7badc96059


Trivial merge