tree dee084800f5bc3da1d185cd4dbcca80dc29cd96e
parent 90426f9a438bd7f5fe751c578e552e3e495783cd
parent 2b6430920410451574da7123b3e33dba205949f7
author Andreas Gampe <agampe@google.com> 1438640802 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438640802 +0000

am 2b643092: am 0c9c5bbd: Merge "ART: Fix stub_test"

* commit '2b6430920410451574da7123b3e33dba205949f7':
  ART: Fix stub_test