commit 9ac0ad81235d0e3e4d0d7c6425878ec2e4f9847d
author Jean-Baptiste Queru <jbq@google.com> Tue Feb 26 22:43:19 2013 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Feb 26 22:43:19 2013 +0000
tree ae8156df3c8c9dddc0b60b9f32e1003306313722
parent 88e237455d52998d08a989204c9cee0f3642f220
parent d1dd7fbb468e76ef322bff7bf74e09fbacf8c731

am d1dd7fbb: am 80db4328: am ca849386: Reconcile with jb-mr1-release - do not merge

* commit 'd1dd7fbb468e76ef322bff7bf74e09fbacf8c731':

common/ddmlib/PREBUILT

diff --git a/common/ddmlib/PREBUILT b/common/ddmlib/PREBUILT
index babeb07..2bcfe32 100644
--- a/common/ddmlib/PREBUILT
+++ b/common/ddmlib/PREBUILT
@@ -1,5 +1,5 @@
 The object in this prebuilt directory can be rebuilt from
 	platform/sdk/ddms/libs/ddmlib
 
-From the commit 6464f39ddb29be9fac3684aa2f6ed50bae8f286e
+From the commit 641afb8bbfa8bc8e980808c22a3e9ecb45008a3c
 

common/ddmlib/ddmlib-prebuilt.jar

diff --git a/common/ddmlib/ddmlib-prebuilt.jar b/common/ddmlib/ddmlib-prebuilt.jar
index d6b22cf..65a524d 100644
--- a/common/ddmlib/ddmlib-prebuilt.jar
+++ b/common/ddmlib/ddmlib-prebuilt.jar
Binary files differ

common/tradefed/PREBUILT

diff --git a/common/tradefed/PREBUILT b/common/tradefed/PREBUILT
index 2d983b5..8f881cd 100644
--- a/common/tradefed/PREBUILT
+++ b/common/tradefed/PREBUILT
@@ -1,4 +1,4 @@
 The object in this prebuilt directory can be rebuilt from
 	platform/tools/tradefederation
 
-From the revision 4f5ecf14475a211b36a0813e5bed9a99db4d9056
+From the revision 324411186f255afc73b6afd7c1faec99d9e0f5de

common/tradefed/tradefed-prebuilt.jar

diff --git a/common/tradefed/tradefed-prebuilt.jar b/common/tradefed/tradefed-prebuilt.jar
index 9803c81..b037fa2 100644
--- a/common/tradefed/tradefed-prebuilt.jar
+++ b/common/tradefed/tradefed-prebuilt.jar
Binary files differ