tree 7afe05f94fc932db86962b65e2e15837d3179007
parent b28591a2a3bf7b1e01b07cc0809316661627923f
parent fb3e9e05822dca74c81744da389227bbaec53bf2
author Yohann Roussel <yroussel@google.com> 1445511207 +0000
committer android-build-merger <android-build-merger@google.com> 1445511207 +0000

Merge "Change jack/dex target dependency to jack script" am: 865c462b1a
am: fb3e9e0582

* commit 'fb3e9e05822dca74c81744da389227bbaec53bf2':
  Change jack/dex target dependency to jack script