OSDN Git Service

Merge "Make InputFilter.AllCaps constructor reject null locales" into oc-mr1-dev
authorRoozbeh Pournader <roozbeh@google.com>
Wed, 2 Aug 2017 21:17:06 +0000 (21:17 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 2 Aug 2017 21:17:06 +0000 (21:17 +0000)
am: 6e8e322ea1

Change-Id: I85033f9b16cf269f1c1ce6d01789d9ed40d1cb96


Trivial merge