OSDN Git Service

am b43cf696: am 848b8e9d: am fa2ce3b3: am f73f79f1: Merge "Use /filelist when OUT_DIR...
authorBrian Carlstrom <bdc@google.com>
Sun, 4 Oct 2015 20:05:54 +0000 (20:05 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sun, 4 Oct 2015 20:05:54 +0000 (20:05 +0000)
* commit 'b43cf69672c72c025f0fe764d49ec950e3b57b81':
  Use $OUT_DIR/filelist when OUT_DIR is set

1  2 
envsetup.sh

diff --cc envsetup.sh
Simple merge