tree 602928d6a9808ec504e072ca05fb498f0c5d482e
parent 1b045b3d66fb18ecf7deec31dd4fd33993f5ae83
parent fa2ce3b38be8889a0ccaa5968ebdeae80f33b0de
author Brian Carlstrom <bdc@google.com> 1443988429 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1443988429 +0000

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

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