From: Brian Carlstrom <bdc@google.com>
Date: Sat, 4 May 2013 00:53:50 +0000 (-0700)
Subject: am 70b4848f: resolved conflicts for merge of c7f23a58 to jb-mr2-dev-plus-aosp
X-Git-Tag: android-x86-4.4-r1~86
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=c895495647e176e753ca69ca76c9065fc3c6e7db;p=android-x86%2Fdalvik.git

am 70b4848f: resolved conflicts for merge of c7f23a58 to jb-mr2-dev-plus-aosp

* commit '70b4848fe3b18bc848d1963b709aeb078c9c464c':
  Remove dx's copy of JUnit. (part II)
---

c895495647e176e753ca69ca76c9065fc3c6e7db