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

rk

3 天以前 9cfcd4c424c99f1f9dede58c3bf5aa0166c95381

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>