added AndroidApp part