tree 767f385ccd4cc6f033740be7d164d2b1cac375d3
parent 57e4abcd2d6432b20595192e376782bcbaad8f54
parent 1a91866400a458138dbb8d46009f4915bbb742e2
author Alan Viverette <alanv@google.com> 1466651991 +0000
committer android-build-merger <android-build-merger@google.com> 1466651991 +0000

Merge \"Notify user when application does not support current display zoom\" into nyc-mr1-dev
am: 1a91866400

Change-Id: I2cc46a18a47379783de0a78b411373d30860af0c