Merge remote-tracking branch 'origin/maanshan' into maanshan

rk

昨天 69758b26403c3c97ad35c2c76125a1ff36a3e9d0

1
2
3
4
5
6
<resources>
    <string name="app_name">ModuleE</string>
 
    <!-- TODO: Remove or change this placeholder text -->
    <string name="hello_blank_fragment">Hello blank fragment</string>
</resources>