OSDN Git Service

Merge "Hide @IntDef and @StringDef annotations from AnroidKeyStore API." into mnc-dev
authorAlex Klyubin <klyubin@google.com>
Tue, 12 May 2015 16:56:10 +0000 (16:56 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 12 May 2015 16:56:15 +0000 (16:56 +0000)
commit56b96da7e1f1825267662df762609c198a8c41d6
tree688386c7b0eb5a35afb523c46f1d2761471c41e0
parent3d8c678136ed34e2573a46123681e6a647e5537d
parentdddd6f73a96a10a07edf486155e3b078380f9146
Merge "Hide @IntDef and @StringDef annotations from AnroidKeyStore API." into mnc-dev
api/current.txt
api/system-current.txt
keystore/java/android/security/EcIesParameterSpec.java
keystore/java/android/security/KeyStoreKeyProperties.java