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)
* commit 'db721836a20f08a96cb479be01195fe94cad9532':
  DO NOT MERGE Enable properties in ext4enc


Trivial merge