resolved conflicts for merge of 3e320a0c to master

Browse Source

Change already in frameworks/native as commit
51eb29fa9a2ffe9c5adb9ea25bfbd51992ff16a4

Change-Id: I23ae58c86dac91efb5210fdc4f080a1d6fb741c3

...

This commit is contained in:

Kenny Root

2014-04-30 09:31:44 -07:00

parent f53418931b 3e320a0cac

commit b3aa8f4804

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available