Fix a bad merge.
Re-add change 103769 (Change-Id: I9e7c94718a5b1f08840b219b304ba3904259a65f) from gingerbread after the bad merge was reverted by master change 104487 (Change-Id: I8fad7ee11f4b26630f3cc4b31cc9cafbe66b3bf4). bug:4157610 Change-Id: I96a75d71220cc7886a5b186b415d8dacf6951ca6
Loading
Please register or sign in to comment