OSDN Git Service

Merge changes from topic 'locale-android-support'
authorDan Albert <danalbert@google.com>
Thu, 13 Jul 2017 08:37:05 +0000 (08:37 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 13 Jul 2017 08:37:05 +0000 (08:37 +0000)
am: 2d585e0070

Change-Id: I993d7f4c2bd448aa11f0ad30d6db4cba625cb590


Trivial merge