am 496d451c: (-s ours) am a5d6afdc: am 2247b043: DO NOT MERGE: idegen: Skip directories named *.java when parsing source.

* commit '496d451c960d52c4ea3bf59cde2a902ca20a54f2':
  DO NOT MERGE: idegen: Skip directories named *.java when parsing source.
This commit is contained in:
Sky Faber
2014-10-24 18:34:10 +00:00
committed by Android Git Automerger

Diff Content Not Available