tree 8cc1d38f9783e8b39b69b63e8c74884c62fdc999
parent 0e7fc491393912ad913ee8da2765988dd90f85fc
parent 5af6b7f5cfb1aa84415512f4be05a44b0c140315
author Android Build Merger (Role) <android-build-merger@google.com> 1500695191 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1500695191 +0000

Merge "Merge "Move icon resources into SettingsLib for phone buddy" into oc-dr1-dev am: 1cc73a5773 am: 5e4b071704" into oc-mr1-dev-plus-aosp