tree db5e2dbb4d9c61aeff6d7565789fe67a97f4957c
parent e6f84a505e074da4ce14df1f067ed68a8fdcabb3
parent 20aeec4a7aeb1d249e07db8e5067a4c62ab7956d
author Alex Light <allight@google.com> 1450213849 -0800
committer android-build-merger <android-build-merger@google.com> 1450213849 -0800

Merge "Combine direct_methods_ and virtual_methods_ fields of mirror::Class" am: 7d5a577c1f
am: 20aeec4a7a  -s ours

* commit '20aeec4a7aeb1d249e07db8e5067a4c62ab7956d':
  Combine direct_methods_ and virtual_methods_ fields of mirror::Class