[automerger skipped] Merge "SurfaceFlinger: prevent division by 0 in...
[automerger skipped] Merge "SurfaceFlinger: prevent division by 0 in Layer::fillInputInfo" am: 19143968 am: 3206a42d
am: 64f8753c -s ours
am skip reason: change_id I7ae84e2838b1562ff62cdd94484bedba954e1f33 with SHA1 282f1d7e is in history
Change-Id: I206e9a6ed2c9dcac3f9adcffd742d14cbea22c58