OSDN Git Service

Merge "Merge "Move icon resources into SettingsLib for phone buddy" into oc-dr1-dev...
authorMatthew Fritze <mfritze@google.com>
Sat, 22 Jul 2017 03:54:25 +0000 (03:54 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 22 Jul 2017 03:54:25 +0000 (03:54 +0000)
commitf4dc9375ebbb1a370bd02115f9d927a5e3b7567f
treeb5fed92e6ffaf9098c9d3fdb4dd4779a5edd8a87
parent572d4e4adf59f05d2f19dc17be36911a0eca4c96
parente4d122215b75726a6a64c7a9e955de25ac2f71d3
Merge "Merge "Move icon resources into SettingsLib for phone buddy" into oc-dr1-dev am: 1cc73a5773 am: 5e4b071704" into oc-mr1-dev-plus-aosp
am: e4d122215b

Change-Id: I23d70ae92ca4fbb661f33339963c349b4b512eb5