[automerger skipped] Merge "SurfaceControl: Fix captureLayers JNI" am: ce98a32755 -s ours am: 3c81a4c537 -s ours am: 8a382eda66 -s ours am: 3dec1113ad -s ours

am: 72733f640b -s ours
am skip reason: change_id I43fa93eea7d79f5b773497e3bb65750866eca2cb with SHA1 fbc22c2b6d is in history

Change-Id: I0e563c8a412d40bb40ff64108956b260d103e023
This commit is contained in:
Brad Ebinger
2019-08-12 12:44:28 -07:00
committed by android-build-merger

Diff Content Not Available