English
Merge branch 'master' into ice-cream-sandwich
Merge branch 'ice-cream-sandwich' into drm2
renaming: ZLInputStreamWithOffset => InputStreamWithOffset
Merge branch 'master' into ice-cream-sandwich
Merge branch 'ice-cream-sandwich' into drm2
code works with html
simplified native code
formatting
Merge branch 'master' into ice-cream-sandwich
Merge branch 'ice-cream-sandwich' into drm2