OSDN Git Service

Merge changes from topic \'jack-server-1.3-a3\' am: e0c7b4ec96 am: 8c8c868180
authorYohann Roussel <yroussel@google.com>
Thu, 22 Oct 2015 11:39:05 +0000 (11:39 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 22 Oct 2015 11:39:05 +0000 (11:39 +0000)
commit92e7b25b9d271dd1ead0c4353828bd45c2d89073
tree54a1214ea2295c904175488b73742a5b98adf213
parentc5ec4b777ca2f18e146fb201573c0a46ca29eb35
parentffb1c9cf5f79d9ad59087d8fcc8dc621583a3e69
Merge changes from topic \'jack-server-1.3-a3\' am: e0c7b4ec96 am: 8c8c868180
am: ffb1c9cf5f  -s ours

* commit 'ffb1c9cf5f79d9ad59087d8fcc8dc621583a3e69':
  Remove LOCAL_JACK_EXTRA_ARGS
  Allow control of jack used for compilation
  Clean call-jack and its callers