tree bf2391a813bf4a7203447df2fedb8047dc0c0e42
parent aeb45c6faf2f41d4ff8d2b240d97014e4cea990f
parent a69dcefda3ec493216f401117417d86f8ef757ac
author Thierry Strudel <tstrudel@google.com> 1436556384 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436556384 +0000

am a69dcefd: am 74a81e66: fix device specific fs_config on build server

* commit 'a69dcefda3ec493216f401117417d86f8ef757ac':
  fix device specific fs_config on build server