OSDN Git Service

am 7d535138: (-s ours) DO NOT MERGE New permissions for social stream.
authorDave Santoro <dsantoro@google.com>
Tue, 4 Oct 2011 22:48:22 +0000 (15:48 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 4 Oct 2011 22:48:22 +0000 (15:48 -0700)
* commit '7d535138c15b3e9f90432fb942f9027fa334b681':
  DO NOT MERGE New permissions for social stream.


Trivial merge