tree a53ddba8fcc76291687b4ef26bf8892427c4b729
parent b0276da8aceda970092b97ccb49aae73755f478b
parent ec178ee58447ba23e5954eb824265e9b30f95009
author Alex Light <allight@google.com> 1450377604 +0000
committer android-build-merger <android-build-merger@google.com> 1450377604 +0000

Merge "Revert "Revert "Combine direct_methods_ and virtual_methods_ fields of mirror::Class"""
am: ec178ee584

* commit 'ec178ee58447ba23e5954eb824265e9b30f95009':
  Revert "Revert "Combine direct_methods_ and virtual_methods_ fields of mirror::Class""