| commit | f0f2ff1a5ba1f7d3ff30db3099efeaae71c01db1 | [log] [tgz] |
|---|---|---|
| author | Dave Santoro <dsantoro@google.com> | Tue Oct 04 15:48:22 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 04 15:48:22 2011 -0700 |
| tree | 74a255ee4071f39cc05de76d94d02868de7011c7 | |
| parent | 2aeecb7aa57242aae29dddff2b9ebd5d21aa3824 [diff] | |
| parent | 7d535138c15b3e9f90432fb942f9027fa334b681 [diff] |
am 7d535138: (-s ours) DO NOT MERGE New permissions for social stream. * commit '7d535138c15b3e9f90432fb942f9027fa334b681': DO NOT MERGE New permissions for social stream.