Commit 78f64660 authored by Makoto Onuki's avatar Makoto Onuki Committed by android-build-merger
Browse files

[automerger skipped] Merge "RESTRICT AUTOMERGE: Fix CTS." into marshmallow-cts-dev 

am: dc4b0665 -s ours
am skip reason: subject contains skip directive

Change-Id: Ibc5f968355f0abab65760be8eac48aeacb867c1b
parents 92d2ef13 dc4b0665
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment