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

doum

昨天 6cf36f0e43c9add691b9a375526ce7dc26209574

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>