tree 954d8ab4c9b7aff3c52f5aef335db46528800cbb
parent 0156e0d255709355b1e8f5303bd8256ab6967b0a
parent 9797e822f8bf3ebfea27240271b715cf3a6837b7
author Colin Cross <ccross@android.com> 1513627722 -0800
committer Colin Cross <ccross@android.com> 1513628381 -0800

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

* aosp/upstream-master:
  Automatic formatting cleanup of Android *.java files.
  Eagerly close directory content stream again when looking for dumped lambdas RELNOTES: None.
  reflect prefix in additional ClassReader methods for consistency with what happens during visit() RELNOTES: None.

Bug: 70415451
Test: m checkbuild
Change-Id: Ia4743853a34a9c0d315663959eac0dcd0fdb627b