tree 3d73cbb2c0f93d2163e3a2ceb4ee55a0a6b42898
parent 14eebfcc4518e66afc961c6ec053a3531deb8d35
parent 52f7c03d041742e9a5aa5a00e26a4ef0c7de2848
author Colin Cross <ccross@android.com> 1489513524 -0700
committer Colin Cross <ccross@android.com> 1489520297 -0700

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

* aosp/upstream-master:
  Clean up android desugar tool's flags a bit
  Change how desugar finds desugared classes to have it working on Windows
  Remove bootclasspath fallback in Android desugaring tool
  Add an --copy_bridges_from_classpath argument
  Desugar calls to Objects.requireNonNull(Object o) to o.getClass()
  Avoid factory methods when desugaring stateless lambdas for Android RELNOTES: Avoid factory methods when desugaring stateless lambdas for Android
  Remove duplicate class.
  More stable naming scheme for lambda classes in desugared android code RELNOTES: More stable naming scheme for lambda classes in desugared android code

Test: m -j ANDROID_COMPILE_WITH_JACK=false
Change-Id: I0ff5b9eb3cac6a020f347c51b79633af13b0576f