Merge "DO NOT MERGE Fixed bug during resolution change" into mnc-dev

am: b0399be998  -s ours

Change-Id: I7a55489df7f9e11b952f9205089d8f61be5eb4ba
This commit is contained in:
Hamsalekha S 2017-05-15 18:49:31 +00:00 committed by android-build-merger
commit 7fe4422739

Diff content is not available