OSDN Git Service

resolved conflicts for merge of a978a3d6 to master
authorAlex Klyubin <klyubin@google.com>
Mon, 13 Apr 2015 17:54:53 +0000 (10:54 -0700)
committerAlex Klyubin <klyubin@google.com>
Mon, 13 Apr 2015 17:54:53 +0000 (10:54 -0700)
commitfbf1472d613572d991bc9d68ded4c9e937f13586
treec401bc8005739b23f27f108274ba03b8b714069b
parent62d1d9efe72752fd00c791f596163856708beac2
parenta978a3d6e9586af8cc7191cde83dcf2742ea5269
resolved conflicts for merge of a978a3d6 to master

Change-Id: Ifd7ca9e1dfa0d50a87f2bafef377fcaeb5d9f6d5
keystore/java/android/security/AndroidKeyStore.java
keystore/java/android/security/KeyGeneratorSpec.java
keystore/java/android/security/KeyPairGeneratorSpec.java
keystore/java/android/security/KeyStoreKeyGeneratorSpi.java
keystore/java/android/security/KeyStoreKeyProperties.java
keystore/java/android/security/KeyStoreKeySpec.java
keystore/java/android/security/KeyStoreParameter.java
keystore/java/android/security/KeyStoreSecretKeyFactorySpi.java