tree 9f55be477b92157a2dcb3f0751d64c1bb8e02fb8
parent d92d9e0ce8e0a073cf049b576c1a1846f5b39761
parent eede88620e4dc9f6363c0990c04b7c0c7dd7202e
author Ying Wang <wangying@google.com> 1459443537 +0000
committer android-build-merger <android-build-merger@google.com> 1459443537 +0000

Merge "Remove obsolete LOCAL_DX_FLAGS."
am: eede886

* commit 'eede88620e4dc9f6363c0990c04b7c0c7dd7202e':
  Remove obsolete LOCAL_DX_FLAGS.

Change-Id: Iee79119e73711cf7f20404fcca2720bb5c89272b