OSDN Git Service

Merge "Fix EmergencyCryptKeeperText initialization" into oc-dev
authorYoshinori Hirano <yoshinori.hirano@sonymobile.com>
Mon, 17 Apr 2017 17:39:45 +0000 (17:39 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 17 Apr 2017 17:39:45 +0000 (17:39 +0000)
commit8a323ab65f3f59a7ec65dc8b935d09543a389d98
tree97c0ef9b9ba21cbf734e9dd19e7dd97b3fc71ed7
parentbde6da6f189407419967c1636e7ecc93a72e5eac
parent1afa1646a20594b10bf0c85aed08734888d7a239
Merge "Fix EmergencyCryptKeeperText initialization" into oc-dev
am: 1afa1646a2

Change-Id: I2cf920ba553587c4da04a1f1973a15d48c89ed80