OSDN Git Service

am 7344a7b5: (-s ours) am 368d7945: (-s ours) DO NOT MERGE Enable properties in ext4enc
authorPaul Lawrence <paullawrence@google.com>
Mon, 1 Jun 2015 15:58:45 +0000 (15:58 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 1 Jun 2015 15:58:45 +0000 (15:58 +0000)
commit74a28d5f6d7567d0ac4b26ec6c6020b8fbb8f571
treeb11de96f03aeae97ac4fd188f25a2c08c0fe85bc
parentb8b2cb47254871836960a64d0a18f9d1a7f44de5
parent7344a7b5afb4a2d4e1f131424a152deef7f49fc2
am 7344a7b5: (-s ours) am 368d7945: (-s ours) DO NOT MERGE Enable properties in ext4enc

* commit '7344a7b5afb4a2d4e1f131424a152deef7f49fc2':
  DO NOT MERGE Enable properties in ext4enc