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

doum

昨天 6cf36f0e43c9add691b9a375526ce7dc26209574

1
2
3
4
5
<?xml version="1.0" encoding="utf-8"?>
<resources>
 
    <color name="white">#FFFFFF</color>
</resources>