Commit e5a1a685 authored by Kenny Root's avatar Kenny Root Committed by Android Git Automerger
Browse files

am 5ba87ae2: am 53c4aff5: resolved conflicts for merge of db3d93e9 to jb-mr2-dev 

* commit '5ba87ae2':
  Move android.security test service to stub package
parents 4512fa09 5ba87ae2
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