From: Roland Levillain <rpl@google.com>
Date: Thu, 10 Dec 2015 10:33:20 +0000 (-0800)
Subject: Merge "Fix imgdiag build rules." am: 6247556fb9
X-Git-Tag: android-x86-7.1-r1~846^2~168
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=b46324ab3afdbcc61bd60f9fad588543af5e6898;p=android-x86%2Fart.git

Merge "Fix imgdiag build rules." am: 6247556fb9
am: 81558dc34a

* commit '81558dc34ace8b5d911f97a065c3089792eb99fc':
  Fix imgdiag build rules.
---

b46324ab3afdbcc61bd60f9fad588543af5e6898