From: Brian Carlstrom <bdc@google.com>
Date: Sat, 12 Jul 2014 01:41:57 +0000 (+0000)
Subject: am dac3f4af: Merge "Whitelist another exception during dex2oat resolving."
X-Git-Tag: android-x86-6.0-r1~145^2~2861
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=cf16ca16;p=android-x86%2Fart.git

am dac3f4af: Merge "Whitelist another exception during dex2oat resolving."

* commit 'dac3f4afe1a3f5626836b6921230c150b68b9d34':
  Whitelist another exception during dex2oat resolving.
---

cf16ca1635df0d04668b09e47563b872f513c6fe