commit 0b3c15f840b5f81fe86a5fa04e356855d89626c7
author Colin Cross <ccross@android.com> Wed Mar 22 10:00:51 2017 -0700
committer Colin Cross <ccross@android.com> Wed Mar 22 10:00:51 2017 -0700
tree 4287a03003b29b55dd87bd3e9d99701fcf99f34f
parent a81405c6ddb7334c1a0feb0e7e10447279f713e8
parent 172122c125f4b4b3eb402b0d5606a7862a28fd47

Merge remote-tracking branch 'aosp/upstream-master' into master

* aosp/upstream-master:
  Add expansion functions to options parser
  Add support to write desugared outputs to a directory RELNOTES: n/a
  Add name of missing class to ClassNotFoundException
  Add support to read inputs from directories
  Create "internal" category of command-line options.
  Refactor options converter logic
  Add a flag (--only_desugar_javac9_for_lint) to disable desugaring lambda expressions for Android Lint.

Test: m -j ANDROID_COMPILE_WITH_JACK=false checkbuild