tree 57e5512ec34be3bf8c62e8f44e185dd6eb929a5e
parent e68ba070bbc68b6a336c1f7b02bbfdc02375defc
parent 5a9f4e58683b6a59e0c0d997bd9817e8ee7fcd52
author TreeHugger Robot <treehugger-gerrit@google.com> 1519164526 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1519164526 +0000

Merge changes I86c37b6d,I976b29bf

* changes:
  Frameworks: Disable two recoverablekeystore tests
  Frameworks: Fix JUnit4 test annotations