tree a8bdd20587ea115d9c186de685adafa80f70080d
parent 42884eb368a29ad741543536d28748d159bc8e96
parent ba367d5ec3aff467df7aca294dc42ac3b95f5c8a
author Xavier Ducrohet <xav@google.com> 1423788637 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1423788637 +0000

am ba367d5e: Merge "Revert "Add targetPlatform for executable binaries"" into studio-1.2-dev automerge: 2c05810 automerge: 3b7b0b5

* commit 'ba367d5ec3aff467df7aca294dc42ac3b95f5c8a':
  Revert "Add targetPlatform for executable binaries"