tree 6a83532b46198766ee79e51d2afbdebc92ef2f5e
parent 98e2c509a636db7c4d9a89c086e8d4ac03a6970b
parent 5db3f97877c0aafd4513c3ed846c48b0fc148b0e
author Elliott Hughes <enh@google.com> 1423619705 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1423619705 +0000

am 5db3f978: Merge "Fix build when TARGET_USERIMAGES_USE_EXT4 is not defined"

* commit '5db3f97877c0aafd4513c3ed846c48b0fc148b0e':
  Fix build when TARGET_USERIMAGES_USE_EXT4 is not defined