OSDN Git Service

Merge "DO NOT MERGE translate arrays in Settings/res" am: 992a4e5500 -s ours
authorsongkailun <songkailun@xiaomi.com>
Wed, 22 Nov 2017 18:57:13 +0000 (18:57 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 22 Nov 2017 18:57:13 +0000 (18:57 +0000)
am: 94cd0e4373

Change-Id: I8c60234d38a9aedd6b2bec24ff053aa2049790bd


Trivial merge