From: Nicolas Geoffray <ngeoffray@google.com>
Date: Thu, 24 Mar 2016 14:38:33 +0000 (+0000)
Subject: Merge "Fix stub_test after semantic conflicting merge."
X-Git-Tag: android-x86-7.1-r1~294^2~44
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=25ff18e161e098a08ff7ade7a697764fdb417669;p=android-x86%2Fart.git

Merge "Fix stub_test after semantic conflicting merge."
am: 1345aa3

* commit '1345aa365e8baae25d2b3a859a4858fffbe6b11f':
  Fix stub_test after semantic conflicting merge.
---

25ff18e161e098a08ff7ade7a697764fdb417669