OSDN Git Service

am c039bb5d: (-s ours) am 66d46ac6: (-s ours) am db52ab69: Merge "DO NOT MERGE Backpo...
authorCostin Manolache <costin@google.com>
Wed, 2 Mar 2011 20:53:37 +0000 (12:53 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 2 Mar 2011 20:53:37 +0000 (12:53 -0800)
commit1b4c6d57fe30bb5d35a80d971fba9fb103dd2971
tree3ba394f1add1e0f2c73fcecabaabd8940f99b135
parent039e634f6137550ee072d78b45243b4c6832e489
parentc039bb5d1ee13660142595bf21b4ac1d1ae129a5
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.