OSDN Git Service

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

Change-Id: Iaa3eb26436dfa339ee7e095562344394dcd56b53


Trivial merge