Merge branch 'master' into google

wjc

22 小时以前 f151e203da870dbe281defcb1daf84a1a38ecac1

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