tree a595b6ae63bf197f5bc5bdc99c1868b31d9970e9
parent e29ccb0d678c712c71bf73f1c66626feff4fa346
parent 60309fc7bb95c9b3fc3e0ed60aa1eeb35bd13a68
author Irfan Sheriff <isheriff@google.com> 1335305583 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1335305583 -0700

Merge "Expose Context.NSD_SERVICE"