commit | 04ec2de540836195507a0553a055cb5e518202ab | [log] [tgz] |
---|---|---|
author | songkailun <songkailun@xiaomi.com> | Wed Nov 22 18:57:13 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Wed Nov 22 18:57:13 2017 +0000 |
tree | 501ba5065aff93dda807dbd57d256dc87125d015 | |
parent | dc75d02b95e71c67aca2356042dcbd97e20994b3 [diff] | |
parent | 94cd0e4373d7310c9d72988718cf0d0d43e5b3fb [diff] |
Merge "DO NOT MERGE translate arrays in Settings/res" am: 992a4e5500 -s ours am: 94cd0e4373 Change-Id: I8c60234d38a9aedd6b2bec24ff053aa2049790bd