OSDN Git Service

Merge changes I86c37b6d,I976b29bf
authorTreeHugger Robot <treehugger-gerrit@google.com>
Tue, 20 Feb 2018 22:08:46 +0000 (22:08 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 20 Feb 2018 22:08:46 +0000 (22:08 +0000)
commit41ed367a63002f68a779aa66ba425d7d6874f99f
tree57e5512ec34be3bf8c62e8f44e185dd6eb929a5e
parente68ba070bbc68b6a336c1f7b02bbfdc02375defc
parent5a9f4e58683b6a59e0c0d997bd9817e8ee7fcd52
Merge changes I86c37b6d,I976b29bf

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