Commit d06297f5 authored by Michael Rosenfeld's avatar Michael Rosenfeld Committed by android-build-merger
Browse files

[automerger skipped] Merge "Make option name public for PTS usage." into... 

[automerger skipped] Merge "Make option name public for PTS usage." into stage-aosp-master am: a746c261 am: 2eb2e1a1
am: 0973a29c  -s ours

Change-Id: Ie3728710d70dcd9179d7e1aa3e21f48648c6b673
parents 1831c02a 0973a29c
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