| commit | 30154ada54dae02f30ff9580ee976888f12e0fd4 | [log] [tgz] |
|---|---|---|
| author | songkailun <songkailun@xiaomi.com> | Wed Nov 22 19:22:50 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Nov 22 19:22:50 2017 +0000 |
| tree | 93a73e700fc1c181d5861a10cf182636984a9ce5 | |
| parent | bd642f9db8699f43bbfb76352e52bc31c4c06c21 [diff] | |
| parent | 04ec2de540836195507a0553a055cb5e518202ab [diff] |
Merge "DO NOT MERGE translate arrays in Settings/res" am: 992a4e5500 -s ours am: 94cd0e4373 am: 04ec2de540 -s ours Change-Id: I1a3e3a48b8d5cf95a404e18efa2de07a76f035a2