tree 15d3c9207442eaefcc712355909c65acc75b0cec
parent 91f40d9bf56e4bb85fb46d0774296214353dae87
parent adf71bf71d0c3ecb68375c44fc8646860217024c
author Elliott Hughes <enh@google.com> 1423624269 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1423624269 +0000

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

* commit 'adf71bf71d0c3ecb68375c44fc8646860217024c':
  Fix build when TARGET_USERIMAGES_USE_EXT4 is not defined