Commits
Kenny Root authored b3aa8f48044M
resolved conflicts for merge of 3e320a0c to master Change already in frameworks/native as commit 51eb29fa9a2ffe9c5adb9ea25bfbd51992ff16a4 Change-Id: I23ae58c86dac91efb5210fdc4f080a1d6fb741c3
Showing diff to3e320a0cac4