Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 686d9ff5: merge from open-source master

Browse Source 
Merge commit '686d9ff53c32ded9b2b02eb9f2040f2030846e51' into kraken

* commit '686d9ff53c32ded9b2b02eb9f2040f2030846e51':
  Use isLocationProviderEnabled to test for enabled providers
  Added WEB_URL_PATTERN for Montenegro ".me"
  long modifier was on the wrong argument.
This commit is contained in:
The Android Open Source Project
2010-05-10 12:53:28 -07:00
committed by Android Git Automerger
parent 4000e06ef6 686d9ff53c
commit 38a410f12a
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/aidl/aidl.cpp
View File

@@ -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;
}