Merge "DO NOT MERGE Fixed bug during resolution change" into mnc-dev am: b0399be998 -s ours am: 7fe4422739 -s ours
am: 6858ba0b0a -s ours
Change-Id: I7468b5b914e45fb98b1914390cf7db5516937912
This commit is contained in:
commit
c8affe233f