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)
commit3e3f0f1ba8bc0b74685c6977b0f6235a2cc7215a
tree0b9f12cacef1dc3ca1efe0267ad7f80d942f2187
parentd4584a8fb5d09dab4e7c416632f14223e7a5d009
parentfd57d549cf535c803ecde5bef3438121a75d2ec2
Merge \"Fix the allowed icon type error message\" into nyc-mr1-dev
am: fd57d549cf

Change-Id: Ibff8d87533d075f0af95ab98d44f67fd4405a951