tree 1260f81edc521cb54c387af7034a8598f59e0380
parent 5bbf44e715d5199868013101030dcd890fffde02
parent ab8148f2f6d470a5576083101f45f3d5398354c7
author TreeHugger Robot <treehugger-gerrit@google.com> 1500694313 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1500694313 +0000

Merge "Move icon resources into SettingsLib for phone buddy" into oc-dr1-dev