From: Paul Lawrence <paullawrence@google.com>
Date: Mon, 1 Jun 2015 15:43:35 +0000 (+0000)
Subject: am 80cd919f: (-s ours) am a47a1331: DO NOT MERGE Use default key permissions for... 
X-Git-Tag: android-x86-7.1-r1~424
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=05fd00c11292918796254a58c09b91fae11e0caf;p=android-x86%2Fsystem-extras.git

am 80cd919f: (-s ours) am a47a1331: DO NOT MERGE Use default key permissions for ext4enc

* commit '80cd919fc50c05644ab2b4d20960bc7abfc34d50':
  DO NOT MERGE Use default key permissions for ext4enc
---

05fd00c11292918796254a58c09b91fae11e0caf