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)
commit04ec2de540836195507a0553a055cb5e518202ab
tree501ba5065aff93dda807dbd57d256dc87125d015
parentdc75d02b95e71c67aca2356042dcbd97e20994b3
parent94cd0e4373d7310c9d72988718cf0d0d43e5b3fb
Merge "DO NOT MERGE translate arrays in Settings/res" am: 992a4e5500  -s ours
am: 94cd0e4373

Change-Id: I8c60234d38a9aedd6b2bec24ff053aa2049790bd