| commit | e4dc139a2ede5f9f6cbdea2392c384846687debf | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Nov 06 12:40:06 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 06 12:40:06 2012 -0800 |
| tree | fb90bdf484d931322c08707793da1131a96353f0 | |
| parent | c3a7c3839ee79260682a9c3dcb32e9474daa7481 [diff] | |
| parent | bc74447080e16c3171229231021ad5ee217b690c [diff] |
am bc744470: (-s ours) Reconcile with jb-mr1.1-release - do not merge * commit 'bc74447080e16c3171229231021ad5ee217b690c':
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