tree 87f99b3a815d81672903d28e79f9e8aafc00032a
parent 6cc233e0e9f42e099248d584cf5ce3d17894e2d9
parent ae0cf6dc9eb92282ef92b00ac68bfaca8aad2a1e
author Fred Quintana <fredq@google.com> 1257900956 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1257900956 -0800

am ae0cf6dc: Merge change I50986dd4 into eclair

Merge commit 'ae0cf6dc9eb92282ef92b00ac68bfaca8aad2a1e' into eclair-plus-aosp

* commit 'ae0cf6dc9eb92282ef92b00ac68bfaca8aad2a1e':
  Make the RegisteredSErvices Cache not allow the registered service for a