Merge "support horizontal scroll and zoom for webview" am: 63621ece0b am: fa9278293f am: 224b9c2895 -s ours
am: 8e160c0e16 -s ours
Change-Id: I3c3e5934003c7184c3cb685424c85dca69fbec3e
This commit is contained in: