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)
commit35dcfebd1ee3e451a870633110c86ba77ff254df
treeae901384fde0f55a8e68ba69b3f12a02a516389c
parentb933b9acd63154de9a8d1d864ab490045aedea1e
parent3e3f0f1ba8bc0b74685c6977b0f6235a2cc7215a
Merge \\"Fix the allowed icon type error message\\" into nyc-mr1-dev am: fd57d549cf
am: 3e3f0f1ba8

Change-Id: Iaa3eb26436dfa339ee7e095562344394dcd56b53