commit | 18d8897470c76fe8fdb9c63200e4504ba74ac68b | [log] [tgz] |
---|---|---|
author | Costin Manolache <costin@google.com> | Wed Mar 02 12:53:37 2011 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Mar 02 12:53:37 2011 -0800 |
tree | 729100fd5958e6b210ef0589ad598a5d9797a9d9 | |
parent | 4f3b8d41fdefcdc9c482098c594b1f468c588fd1 [diff] | |
parent | fbbb4a338e884cbd961dc82d539fba86f9154f4e [diff] |
am c039bb5d: (-s ours) am 66d46ac6: (-s ours) 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 'c039bb5d1ee13660142595bf21b4ac1d1ae129a5': DO NOT MERGE Backport (with modifications ) some changes from Honeycomb, that would allow authenticators to control caching and permissions.