From: Alex Light <allight@google.com>
Date: Fri, 13 Nov 2015 00:58:28 +0000 (+0000)
Subject: Merge "Fix bug with test 964." am: 1227d627e0
X-Git-Tag: android-x86-7.1-r1~846^2~61^2~19
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=a16280008f66848be443d45fe98fb390b190b96b;p=android-x86%2Fart.git

Merge "Fix bug with test 964." am: 1227d627e0
am: 292c532b78

* commit '292c532b78c073fa696a29efe01490bd3b06ad41':
  Fix bug with test 964.
---

a16280008f66848be443d45fe98fb390b190b96b