tree 4417a174ddf9fe13a0e841d150eca6b0b185378d
parent 45b0c8f1633ea7762e5bd9517d89cb716e09beb4
parent 6b37c7b32af667f6a42b397a27add34d3c59e5fa
author Shinichiro Hamaji <hamaji@google.com> 1443155330 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1443155330 +0000

am 6b37c7b3: Merge "Allow USE_GOMA=true without explicit USE_NINJA=true"

* commit '6b37c7b32af667f6a42b397a27add34d3c59e5fa':
  Allow USE_GOMA=true without explicit USE_NINJA=true