OSDN Git Service

Merge "Allow more flexibility for icon selection" into pi-dev am: 2e79c79ecd
authorBrad Stenning <stenning@google.com>
Thu, 12 Apr 2018 03:36:00 +0000 (20:36 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 12 Apr 2018 03:36:00 +0000 (20:36 -0700)
am: 983738a2dd

Change-Id: Iaf083e0a16ad28bdbe5834b5b5dd143544cf93db


Trivial merge