OSDN Git Service

am 80cd919f: (-s ours) am a47a1331: DO NOT MERGE Use default key permissions for...
authorPaul Lawrence <paullawrence@google.com>
Mon, 1 Jun 2015 15:43:35 +0000 (15:43 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 1 Jun 2015 15:43:35 +0000 (15:43 +0000)
commit05fd00c11292918796254a58c09b91fae11e0caf
tree1a839cde26763d913e7ca746b4584b619340689a
parentfd8cc3a1aa7f4e667cf6694f7a562c8c33a54710
parent80cd919fc50c05644ab2b4d20960bc7abfc34d50
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