OSDN Git Service

Merge \"Fix the allowed icon type error message\" into nyc-mr1-dev
authorMakoto Onuki <omakoto@google.com>
Fri, 15 Jul 2016 21:50:46 +0000 (21:50 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 15 Jul 2016 21:50:46 +0000 (21:50 +0000)
am: fd57d549cf

Change-Id: Ibff8d87533d075f0af95ab98d44f67fd4405a951


Trivial merge