Merge "Ensure preference icon is returned when inflated from XML even if it has not been displayed yet." into cw-f-dev

am: 02014a62ab

Change-Id: Ia2637175965656bab350c7d479266093ff5764be
This commit is contained in:
Michael Kwan
2016-09-07 22:15:58 +00:00
committed by android-build-merger

Diff Content Not Available