Skip to content
Commit 41ed367a authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes I86c37b6d,I976b29bf 

* changes:
  Frameworks: Disable two recoverablekeystore tests
  Frameworks: Fix JUnit4 test annotations
parents e68ba070 5a9f4e58
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