Merge "DO NOT MERGE Fixed bug in the case of resolution change." into nyc-dev am: 3d01dc4bdd am: cba660f4c9 am: dab287d4a0 am: b481f67005

am: ebc18d97c1  -s ours

Change-Id: If0796ca69ce96a7a34bfe071b87c9808e9882e82
This commit is contained in:
Ray Essick 2017-05-12 17:54:56 +00:00 committed by android-build-merger
commit dd9be11079

Diff content is not available