Merge "Merge "Input Settings: Change the \'add\' icon." into nyc-dev am: 8aa7cf1 am: 5749a18" into nyc-mr1-dev-plus-aosp
am: 44dea6c
* commit '44dea6cbc2781925e574fbb2e8c5e218b03c49e6':
Change-Id: Ic2bc148498c850fde004e7a75a02264829f9fbae
This commit is contained in: