am 7d535138: (-s ours) DO NOT MERGE New permissions for social stream.

* commit '7d535138c15b3e9f90432fb942f9027fa334b681':
  DO NOT MERGE New permissions for social stream.
This commit is contained in:
Dave Santoro 2011-10-04 15:48:22 -07:00 committed by Android Git Automerger
commit d31a2f7c8b

Diff Content Not Available