OSDN Git Service

resolved conflicts for merge of c7f23a58 to jb-mr2-dev-plus-aosp
authorBrian Carlstrom <bdc@google.com>
Sat, 4 May 2013 00:50:05 +0000 (17:50 -0700)
committerBrian Carlstrom <bdc@google.com>
Sat, 4 May 2013 00:50:05 +0000 (17:50 -0700)
commit70b4848fe3b18bc848d1963b709aeb078c9c464c
treedd817345ac95ac506a6532941773f9865c549625
parent1634c64ce162d79aad96a7d7ca82fa0f750d5df6
parentc7f23a5816367f4d23f1bd9ed7621fd27fc294ed
resolved conflicts for merge of c7f23a58 to jb-mr2-dev-plus-aosp

Change-Id: Ic1ff892898884326151d02a53c15f5bb4bb57c28
dx/junit-tests/Android.mk