tree ac48b22a97e021f1829689d2f0e0e1c84c9cb980
parent 1dcffadbc7c263b22533825655bcfa7846c8b6c5
parent 34a9885f34f8792c6cb9886afeb9b5c961eab326
author Colin Cross <ccross@android.com> 1506119803 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1506119803 +0000

Merge "Revert "Revert "Support <dir>:<file> for LOCAL_JAVA_RESOURCE_FILES"""