OSDN Git Service

Merge "Serialize key eviction vs. user storage preparation" into pi-dev
authorPavel Grafov <pgrafov@google.com>
Wed, 18 Apr 2018 19:39:42 +0000 (12:39 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 18 Apr 2018 19:39:42 +0000 (12:39 -0700)
commit765a015f8ab66b76b73e9af2058f3d1d9fa3a377
treefea1fb1eb9dcf6953626fbe38d8b9515a275b549
parent7a654bd40b846d8b128298dbb7a566987d17dea8
parenta2f4dd1cfd26e1c7c5affbe059bc5e7bd0b34606
Merge "Serialize key eviction vs. user storage preparation" into pi-dev
am: a2f4dd1cfd

Change-Id: I9b4e65b55a0201e054ed624a2747c9a0473e42d0