tree f11f31a58a89c1a995463154ed49431875cf4dee
parent dc289ce17c1f009e3054d0c176b2aefc78887b9e
parent b3cd0a566391726a69d9f0e439268f4caf5df7db
author Shinichiro Hamaji <hamaji@google.com> 1440128172 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440128172 +0000

am b3cd0a56: am 39c7d243: Merge "Use goma when USE_GOMA=true is set"

* commit 'b3cd0a566391726a69d9f0e439268f4caf5df7db':
  Use goma when USE_GOMA=true is set