tree d5923d0aa10137539f20ed1b8c2d4d7a05e4e10e
parent 4de5f28cdc9f3af267a38b355c3daafa49a9892b
parent 31d4e4da36dff61b62ef3537c9574348e2d38077
author Colin Cross <ccross@android.com> 1500670837 +0000
committer android-build-merger <android-build-merger@google.com> 1500670837 +0000

Merge "Disable desugaring try-with-resources" am: 28794da1c0 am: e99de69665 am: d11b4bdd21
am: 31d4e4da36

Change-Id: Ic933753b50497ce903fd72030e00bd251dc4cafc