tree ea7e797015ae4e57089514f6f1b53d2d1fbf15f7
parent a7509eeef5d687000688bddedaae91a261c58c13
parent 2e5b38d83234ff5a9a068ab07e7c51187ecd81a3
author Brian Carlstrom <bdc@google.com> 1385424047 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1385424047 -0800

am 2e5b38d8: Merge "Fix BUILD_DALVIK_HOST_JAVA_LIBRARY to BUILD_HOST_DALVIK_JAVA_LIBRARY"

* commit '2e5b38d83234ff5a9a068ab07e7c51187ecd81a3':
  Fix BUILD_DALVIK_HOST_JAVA_LIBRARY to BUILD_HOST_DALVIK_JAVA_LIBRARY