From: Nicolas Geoffray <ngeoffray@google.com>
Date: Thu, 18 Jun 2015 08:01:10 +0000 (+0000)
Subject: am bee9b6ef: am 3c4fb2d1: Merge "Forgot this change in last commit."
X-Git-Tag: android-x86-7.1-r1~2285
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=303fce6a3b6cef6d5ca606de82fe89479b7eba63;p=android-x86%2Fart.git

am bee9b6ef: am 3c4fb2d1: Merge "Forgot this change in last commit."

* commit 'bee9b6ef11cdcc67c82ef33c165994f3beaee3ff':
  Forgot this change in last commit.
---

303fce6a3b6cef6d5ca606de82fe89479b7eba63