tree c5fbe712953f13bb598de6d0df627a6553acff61
parent 3a38a808920f6ee43da5b11b287cd9940395e909
parent fc41516ef5198b14aeb0fe9a85f7b4e7c842b5ef
author Roland Levillain <rpl@google.com> 1449746298 +0000
committer android-build-merger <android-build-merger@google.com> 1449746298 +0000

Merge "Fix the build-art-multi-executable Make function." am: a10a0750cf
am: fc41516ef5

* commit 'fc41516ef5198b14aeb0fe9a85f7b4e7c842b5ef':
  Fix the build-art-multi-executable Make function.