am 6d630607: am 5cdd7858: Merge "Fix issue #2553553: API REVIEW:...
am 6d630607: am 5cdd7858: Merge "Fix issue #2553553: API REVIEW: android.context.Context" into froyo
Merge commit '6d630607' into kraken
* commit '6d630607':
Fix issue #2553553: API REVIEW: android.context.Context