tree 0403f2d09ce8d975920229cb5dd55bfa5710ae0d
parent a9722e29278710c32d84604fd338a4e05ebbb320
parent b43cf69672c72c025f0fe764d49ec950e3b57b81
author Brian Carlstrom <bdc@google.com> 1443989154 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1443989154 +0000

am b43cf696: am 848b8e9d: am fa2ce3b3: am f73f79f1: Merge "Use /filelist when OUT_DIR is set" into mnc-dev

* commit 'b43cf69672c72c025f0fe764d49ec950e3b57b81':
  Use $OUT_DIR/filelist when OUT_DIR is set