tree af9e459e7da88c59a5c9b685d340c722e149bb32
parent 7ee3b85eba08304cb9e396aaf52a77729f125532
parent ad8df5adac7d844014f74c60ce40e3cae02e5eaf
author Shinichiro Hamaji <hamaji@google.com> 1443499424 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1443499424 +0000

am ad8df5ad: Merge "Reland: Only put PARSE_TIME_MAKE_GOALS into KATI_TARGETS"

* commit 'ad8df5adac7d844014f74c60ce40e3cae02e5eaf':
  Reland: Only put PARSE_TIME_MAKE_GOALS into KATI_TARGETS