tree f674aa47e49d612d14b6d2fe106951850db2f43c
parent e4bdbc840bc0ee031ea16da2510e2eca2b228d6a
parent ec8dee180d5b67de5b7d1bf6cc177a533cfa90fa
author Jim Miller <jaggies@google.com> 1297907357 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1297907357 -0800

Merge "Fix 3197205: Minor edits to device policy admin strings and documentation"