tree 173ca41ba603d3409d91cff13b3404cbe3c81aeb
parent f9bd3d82f1a6451fc9c1f7e3a4017bdc1d13bc58
parent 210d2d0863c5d64695e2509d80144d69b5917ecf
author Colin Cross <ccross@android.com> 1443809321 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1443809321 +0000

am 210d2d08: am b9599804: Merge "Move the dist-as-droid handling from make to ninja"

* commit '210d2d0863c5d64695e2509d80144d69b5917ecf':
  Move the dist-as-droid handling from make to ninja