Merge branch 'master' into 1.2.1_google

wjc

4 天以前 29e200b8db74d31f49d4d1ac64a41ad44e1b3a90

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