tree 11abca84a1930fceca3fb870120715add1e857a1
parent e6dbb405ff849d86b6fa7a0092e99cab3927dfd9
parent 19b7d3bea50b909aa791846ed5a2595e07db316f
author Alex Light <allight@google.com> 1462210987 +0000
committer android-build-merger <android-build-merger@google.com> 1462210987 +0000

Merge "Remove misleading line from dx.jar Android.mk file." am: 96a1c677c7
am: 19b7d3bea5

* commit '19b7d3bea50b909aa791846ed5a2595e07db316f':
  Remove misleading line from dx.jar Android.mk file.

Change-Id: Ia98e39543b3bef31e448d9d6ee4bd0fa0b5919f5