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