tree a0b0b82917d9ed3bc0c52a6dd30877269f96f837
parent 9429afba06d96973ea4bf76abba945dd92a1debb
parent 9422bdca314064fe82075b90cf529865c8053c44
author Amith Yamasani <yamasani@google.com> 1365646897 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1365646897 +0000

Merge "Don't sync from adapters that haven't opted in to restricted accounts" into jb-mr2-dev