Commit 716f1734 authored by Kiyoung Kim's avatar Kiyoung Kim Committed by android-build-merger
Browse files

[automerger skipped] Schematize Crypto system properties am: c67266e7 am: 79d2dc2f 

am: cf6bd330 -s ours
am skip reason: change_id I2774128e7be9367f386cfc3a2eafb7e398bf5e9b with SHA1 477b2111 is in history

Change-Id: I74de7da60acb739a1a72a7d143155664162d2a21
parents a6cd44ee cf6bd330
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