D-25(m)

v-2.0
---
1. test updating

    ==> done
D-25(m)

v-2.0
---
1. test updating

    ==> done
Merge branch 'D-25_content-provider'