OSDN Git Service

Merge "Move icon resources into SettingsLib for phone buddy" into oc-dr1-dev
authorMatthew Fritze <mfritze@google.com>
Sat, 22 Jul 2017 03:37:47 +0000 (03:37 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 22 Jul 2017 03:37:47 +0000 (03:37 +0000)
commit5e4b071704d8795cc76d42bc881b758d62068ae6
tree01d91a601ecea40ccbae26dec97b5c9e158df522
parent58a611b3a2ea79c0ff6ac6bc48b077e669e8a6b5
parent1cc73a5773843719a4eda61910a59f15fb585279
Merge "Move icon resources into SettingsLib for phone buddy" into oc-dr1-dev
am: 1cc73a5773

Change-Id: I7bba78003073c79aaf692a01f0f6980b40e45598