Merge branch 'master' into google

wjc

5 天以前 dcdd7495322c36bc41c7d18fa91dc8884bc976ef

1
2
3
4
5
<?xml version="1.0" encoding="utf-8"?> 
<resources> 
 
  <integer name="animation_default_duration">300</integer> 
</resources>