OSDN Git Service

resolved conflicts for merge of 1d5a2592 to master
authorAlex Klyubin <klyubin@google.com>
Tue, 14 Apr 2015 21:23:07 +0000 (14:23 -0700)
committerAlex Klyubin <klyubin@google.com>
Tue, 14 Apr 2015 21:23:07 +0000 (14:23 -0700)
commit338e74648ddfe480cf4bfb52cf5a9bb8732e1135
tree235b3137adf18ae1451c5208f2dc005ea7a66df4
parent7caa691652a901ac354755c44990cca11b5cdb23
parent1d5a259276c897743936b250cde5e22555604d62
resolved conflicts for merge of 1d5a2592 to master

Change-Id: Ia1ea7c9c8c23eeffcd596b96506e961989ccb7a6
keystore/java/android/security/EcIesParameterSpec.java