tree c4af6410ae6a04e04cd978ca74f6b8e9b68497ff
parent 852585c034d383ea6afe1b484afa57cbf4d04f95
parent 098d466a25cf294487188b34dfa95575911a37cf
author Dave Santoro <dsantoro@google.com> 1321561577 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1321561577 -0800

Merge "Unhide social stream permissions." into ics-mr1