tree f7da5ef762a11795fbb56f2b505079f861a821c0
parent dbfe5a7ecb3d891201ffcb255d4d6af62b5d07ff
parent cd7bcd86e5b7a8ba5cd6dde7dda04cadcf656e56
author Colin Cross <ccross@android.com> 1443649394 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1443649394 +0000

am cd7bcd86: Merge "Move ninja files to "

* commit 'cd7bcd86e5b7a8ba5cd6dde7dda04cadcf656e56':
  Move ninja files to $(OUT_DIR)