commit c3a7c3839ee79260682a9c3dcb32e9474daa7481
author The Android Open Source Project <initial-contribution@android.com> Tue Nov 06 12:31:17 2012 -0800
committer Android Git Automerger <android-git-automerger@android.com> Tue Nov 06 12:31:17 2012 -0800
tree fb90bdf484d931322c08707793da1131a96353f0
parent ae36f1e9f30d1d3e3951a9e55f084ab4ce229c87
parent 08ea3b10b482d4d08e59e03291d2feb3b361500d

am 08ea3b10: (-s ours) am 5535a9e9: am 8a1238b6: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

* commit '08ea3b10b482d4d08e59e03291d2feb3b361500d':

current/android.jar

diff --git a/current/android.jar b/current/android.jar
index 411a27c..5f6734c 100644
--- a/current/android.jar
+++ b/current/android.jar
Binary files differ

tools/darwin/aidl

diff --git a/tools/darwin/aidl b/tools/darwin/aidl
index 3fdadd6..650444e 100755
--- a/tools/darwin/aidl
+++ b/tools/darwin/aidl
Binary files differ

tools/linux/aidl

diff --git a/tools/linux/aidl b/tools/linux/aidl
index 746e25d..7a1c0e4 100755
--- a/tools/linux/aidl
+++ b/tools/linux/aidl
Binary files differ