tree 96f3f481542a5c5bd2b823e6f8307caf5e3126d8
parent daeebaf4958c27864102e13b2a5d725529ac8270
parent 0746ec10aedbab904947482ef19bae2c7ee7b205
author Elliott Hughes <enh@google.com> 1422042912 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422042912 +0000

am 0746ec10: Merge "Don\'t build junit-hostdex and core-junit-hostdex on mac os."

* commit '0746ec10aedbab904947482ef19bae2c7ee7b205':
  Don't build junit-hostdex and core-junit-hostdex on mac os.