tree 72c5fcbdb7684d5c336c4bbae16a8ced13d3f91b
parent 7fff2d19a24f9f9b669676864dc5652ab179d2fc
parent db52ab69f22e24615eaa2e8f9845e157426d3dd6
author Costin Manolache <costin@google.com> 1299011380 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1299011380 -0800

am db52ab69: Merge "DO NOT MERGE Backport (with modifications ) some changes from Honeycomb, that would allow authenticators to control caching and permissions." into gingerbread

* commit 'db52ab69f22e24615eaa2e8f9845e157426d3dd6':
  DO NOT MERGE Backport (with modifications ) some changes from Honeycomb, that would allow authenticators to control caching and permissions.