tree bb05e200d0717a5995ee6bf9c099347fb03b39ff
parent 0b31970cac04259a6e20dfc6d6e42cd9532528e3
parent 88209d15dd5fcb883403525a6455857566e3aee7
author Andy Stadler <stadler@google.com> 1265699191 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1265699191 -0800

Merge "Fixes to DeviceAdmin & DevicePolicyManager Javadoc"