OSDN Git Service

am 70b4848f: resolved conflicts for merge of c7f23a58 to jb-mr2-dev-plus-aosp
authorBrian Carlstrom <bdc@google.com>
Sat, 4 May 2013 00:53:50 +0000 (17:53 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 4 May 2013 00:53:50 +0000 (17:53 -0700)
* commit '70b4848fe3b18bc848d1963b709aeb078c9c464c':
  Remove dx's copy of JUnit. (part II)


Trivial merge