From: Vladimir Marko <vmarko@google.com>
Date: Thu, 31 Mar 2016 15:42:34 +0000 (+0000)
Subject: Merge "Fix silly gcc warning." am: f7cdec5
X-Git-Tag: android-x86-7.1-r1~248^2~137^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=6d9b3b69059a2d683ba6cda24db84b6cc92b2978;p=android-x86%2Fart.git

Merge "Fix silly gcc warning." am: f7cdec5
am: 2901872

* commit '2901872d93275350b89434a3ea7884f4f8d53030':
  Fix silly gcc warning.

Change-Id: I19a70f5f8f6e1a4e2093a47418a03c75fbd0109f
---

6d9b3b69059a2d683ba6cda24db84b6cc92b2978