tree bb17c84bcea54b0a25a7fea66e57d826f55e94dd
parent 6a14ba317cea22f16db3bb76cb818fd7322b8253
parent 3fc56a1fa18399f9dfaa2d9a7ae2c7aee852d574
author Dan Willemsen <dwillemsen@google.com> 1445290220 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1445290220 +0000

am 3fc56a1f: am 77493047: Merge "Add support for LOCAL_SRC_FILES_EXCLUDE"

* commit '3fc56a1fa18399f9dfaa2d9a7ae2c7aee852d574':
  Add support for LOCAL_SRC_FILES_EXCLUDE