| commit | 31e5f3b30ccf4102880cd8ab2c143ed5b5bfb5fb | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Nov 14 12:44:54 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 14 12:44:54 2012 -0800 |
| tree | cce154869fe2336a28fad19f30c5e83f107aa3d9 | |
| parent | 26774639e6c4562d3949c5ff0f6faeabb3cc75b0 [diff] | |
| parent | 350b4e9ce2844a5c3a5c1fb73e5738f0622e49e9 [diff] |
am 350b4e9c: (-s ours) Reconcile with jb-mr1.1-release - do not merge * commit '350b4e9ce2844a5c3a5c1fb73e5738f0622e49e9':
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
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
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