OSDN Git Service

am db721836: (-s ours) am 2ecc6428: DO NOT MERGE Enable properties in ext4enc
authorPaul Lawrence <paullawrence@google.com>
Mon, 1 Jun 2015 15:43:34 +0000 (15:43 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 1 Jun 2015 15:43:34 +0000 (15:43 +0000)
commitfd8cc3a1aa7f4e667cf6694f7a562c8c33a54710
tree1a839cde26763d913e7ca746b4584b619340689a
parentc3768b497530717648cc700df9352f2c245fa73c
parentdb721836a20f08a96cb479be01195fe94cad9532
am db721836: (-s ours) am 2ecc6428: DO NOT MERGE Enable properties in ext4enc

* commit 'db721836a20f08a96cb479be01195fe94cad9532':
  DO NOT MERGE Enable properties in ext4enc