hikari added
Merge branch 'master' of github.com:paul-xxx/b2g-manifest