From: TreeHugger Robot <treehugger-gerrit@google.com>
Date: Wed, 25 May 2016 23:07:00 +0000 (+0000)
Subject: Merge "Guard against IllegalArgumentException" into nyc-dev
X-Git-Tag: android-x86-7.1-r1~456^2~77
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=96305a2b34;p=android-x86%2Fpackages-apps-Settings.git

Merge "Guard against IllegalArgumentException" into nyc-dev
---

96305a2b34b9b22d815200372c7636d28175b8fd