tree 602928d6a9808ec504e072ca05fb498f0c5d482e
parent 8d7715ed44b4af7d3c6cdb8828616c10e33fb612
parent 848b8e9d2cc9f8229c95b3f2d9f92c97726ad8a6
author Brian Carlstrom <bdc@google.com> 1443988856 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1443988856 +0000

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

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