tree ec653feea2cc63af10b70a0f47aa27cd08dc3497
parent 0239f4d1c21a8aeb56e6ad8e22222274f83ff1b4
parent 6c3281a7c7a2d57ff8de89dcad1ab62e34bf0d5d
author John Reck <jreck@google.com> 1465916675 +0000
committer android-build-merger <android-build-merger@google.com> 1465916675 +0000

Merge \\\"Redraw if dirty during stopped when resumed\\\" into nyc-dev am: 5b4ff21a74 am: fc4c59a10c
am: 6c3281a7c7

Change-Id: I67192e2450293a6520a30ed78c8381b89558841b