| commit | 2998cb124212b1993a7d9fb5a93522b7955e329b | [log] [tgz] |
|---|---|---|
| author | Dave Santoro <dsantoro@google.com> | Thu Nov 17 15:12:52 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Nov 17 15:12:52 2011 -0800 |
| tree | 27bbc5d508fc7a2ddaa93dcf8bdc84e0ba691b97 | |
| parent | c0a9a1c232d1e431c5e8078e55af50d25fc840b2 [diff] | |
| parent | e16f48b12632b4fdc62e501167a5b228307bff7e [diff] |
am 60e345a9: am 9be49620: Merge "Unhide social stream permissions." into ics-mr1 * commit '60e345a9a95a0f24804f729eeb5216012d1bcbac': Unhide social stream permissions.