diff options
| author | Josh Guilfoyle <Josh.Guilfoyle@T-Mobile.com> | 2010-12-23 14:30:28 -0800 |
|---|---|---|
| committer | Josh Guilfoyle <Josh.Guilfoyle@T-Mobile.com> | 2010-12-23 22:33:16 -0800 |
| commit | ce9c0447f946d8fe20d020f01b6548c815579848 (patch) | |
| tree | 27f4eac06f8960e31f9dfb670f4e67f11029e486 /tools/aidl/aidl.cpp | |
| parent | 0e7ab2f533037698b4ab4255828fa2e08f90566f (diff) | |
| parent | 6bcc7a7e5fc5a2340c4f060141bec9d181454807 (diff) | |
| download | frameworks_base-ce9c0447f946d8fe20d020f01b6548c815579848.zip frameworks_base-ce9c0447f946d8fe20d020f01b6548c815579848.tar.gz frameworks_base-ce9c0447f946d8fe20d020f01b6548c815579848.tar.bz2 | |
Merge commit 'android-2.3.1_r1' into themes-exp-2.3.1_r1
Conflicts:
core/java/android/app/ActivityThread.java
core/java/android/content/pm/ApplicationInfo.java
core/java/android/content/pm/PackageParser.java
core/res/AndroidManifest.xml
services/java/com/android/server/PackageManagerService.java
services/java/com/android/server/SystemServer.java
test-runner/src/android/test/mock/MockPackageManager.java
Diffstat (limited to 'tools/aidl/aidl.cpp')
| -rw-r--r-- | tools/aidl/aidl.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/aidl/aidl.cpp b/tools/aidl/aidl.cpp index fc658f5..f17f66b 100644 --- a/tools/aidl/aidl.cpp +++ b/tools/aidl/aidl.cpp @@ -55,7 +55,7 @@ test_document(document_item_type* d) printf("parcelable %s %s;\n", b->package, b->name.data); } else { - printf("UNKNOWN d=0x%08x d->item_type=%ld\n", (long)d, d->item_type); + printf("UNKNOWN d=0x%08lx d->item_type=%d\n", (long)d, d->item_type); } d = d->next; } |