tree 0c0263f40a2f6a94f5558e455a8e40630841a1ae
parent e8cc22765a3016e1dc64008612c123aaf4d36a80
parent 8264d43883171b6c0233ec9d2bdd17c614027e91
author Colin Cross <ccross@android.com> 1489682036 -0700
committer Colin Cross <ccross@android.com> 1489682788 -0700

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

* aosp/upstream-master:
  Uniquify bridge methods generated during lambda desugaring
  Allow to have several inputs and outputs
  Speed-up the search for desugared classes in case of many lambdas by limiting the search to the directory where we expect the file.

Bug: 36201257
Test: m -j ANDROID_COMPILE_WITH_JACK=false
Change-Id: Ifa6df92757bebd047da3430bbd84b2118dcd718e