OSDN Git Service

Merge "Fix dalvik tests post-conscrypt."
authorElliott Hughes <enh@google.com>
Fri, 3 May 2013 18:55:51 +0000 (18:55 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Fri, 3 May 2013 18:55:51 +0000 (18:55 +0000)
commit0bc4a05819575824bde922e713146337f7cb5eec
treec4a776dc3fd3d2130bf3b1d2d21a29ba865abdc2
parent0d5f6f6e7099f737cbc28611d9a96218d0149e05
parent5dedc95f562c09c29657ddf340af499af7c65abd
Merge "Fix dalvik tests post-conscrypt."