From: Richard Uhler <ruhler@google.com>
Date: Mon, 2 Mar 2015 15:58:52 +0000 (+0000)
Subject: am 85e984b7: am 4ab52e75: Merge "Don\'t require three-character extensions for dex... 
X-Git-Tag: android-x86-6.0-r1~145^2~539
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=8b25ddab48e9949a53a926879f0d05f0348d3a88;p=android-x86%2Fart.git

am 85e984b7: am 4ab52e75: Merge "Don\'t require three-character extensions for dex locations."

* commit '85e984b7c51a9ebc94f5d06ef4a64d576f39867c':
  Don't require three-character extensions for dex locations.
---

8b25ddab48e9949a53a926879f0d05f0348d3a88