tree 79c01b318bf103d5644b0746f6441d8c219bdcb7
parent 3f47a1fb79e613ff3e882de68227ac7ff1a8a6d4
parent 0fc16a2702bc5193fb61320be79f513cf0c64838
author Nicolas Geoffray <ngeoffray@google.com> 1449762465 +0000
committer android-build-merger <android-build-merger@google.com> 1449762465 +0000

Merge "Fix braino when resolving an invoke-super." am: d48015603a
am: 0fc16a2702

* commit '0fc16a2702bc5193fb61320be79f513cf0c64838':
  Fix braino when resolving an invoke-super.