tree 312ea3359b46e6e35733fd1cb8f0b67e6742b517
parent 60c0454d1dda493f9f2afa222cde8f1f89618604
parent 1029013a0db29b926da93d2400b181d1c3b495fe
author Yohann Roussel <yroussel@google.com> 1405694627 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1405694627 +0000

am 1029013a: Merge "Put only src in FRAMEWORKS_SUPPORT_JAVA_SRC_DIRS for multidex"

* commit '1029013a0db29b926da93d2400b181d1c3b495fe':
  Put only src in FRAMEWORKS_SUPPORT_JAVA_SRC_DIRS for multidex