| commit | 1b4c6d57fe30bb5d35a80d971fba9fb103dd2971 | [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 | 3ba394f1add1e0f2c73fcecabaabd8940f99b135 | |
| parent | 039e634f6137550ee072d78b45243b4c6832e489 [diff] | |
| parent | c039bb5d1ee13660142595bf21b4ac1d1ae129a5 [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.