Skip to content
Commit 3dec1113 authored by Brad Ebinger's avatar Brad Ebinger Committed by android-build-merger
Browse files

[automerger skipped] Merge "SurfaceControl: Fix captureLayers JNI" am:... 

[automerger skipped] Merge "SurfaceControl: Fix captureLayers JNI" am: ce98a327 -s ours am: 3c81a4c5 -s ours
am: 8a382eda -s ours
am skip reason: change_id I43fa93eea7d79f5b773497e3bb65750866eca2cb with SHA1 fbc22c2b is in history

Change-Id: Iac7825da7163c0f2d0aebf808811922aeb0a2a21
parents 5606325e 8a382eda
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment