tree 682df145b9b5cf4a40cf1afa3856c5e7e6bf3d18
parent ea4966442cd035e592aa73c0c29225efe3f091fb
parent 28433dbdabd3f60224131039911a8f1def3fe670
author Svetoslav <svetoslavganov@google.com> 1413331378 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1413331379 +0000

Merge "Fix a NPE in device policy manager service." into lmp-dev