tree ec1c9db0529126a058efbc77c407b01c7217d8aa
parent d9d2a434a2a351b417029616d78090d0b30b920e
author hsyed <h.a.syed@gmail.com> 1534184360 +0100
committer Hassan Syed <h.a.syed@gmail.com> 1534184425 +0100

cherry some changes from android branch