tree f7ac471321469eb03123e8f150885730373ae146
parent 2646b3a46af3a24d54acffb1f956deeb6831d3ab
parent 941221c1577a34c922c03b30be7ef0a4afda4278
author Victoria Lease <violets@google.com> 1349395901 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1349395902 -0700

Merge "Handle other providers in isAllowedProviderSafe()" into jb-mr1-dev