tree d5d151bf0502af93fe8826f368807ab1df7734aa
parent 0211b099a0590b2ce23a43714ff1398f96825fe2
parent 7d5a577c1f256a7703361afb071dcd4ecc7d275f
author Alex Light <allight@google.com> 1450204366 +0000
committer android-build-merger <android-build-merger@google.com> 1450204366 +0000

Merge "Combine direct_methods_ and virtual_methods_ fields of mirror::Class"
am: 7d5a577c1f

* commit '7d5a577c1f256a7703361afb071dcd4ecc7d275f':
  Combine direct_methods_ and virtual_methods_ fields of mirror::Class