OSDN Git Service

Merge "Fixing NPE in device policy tests" into cw-f-dev
authorAshley Smith <ashleymarie@google.com>
Mon, 8 Aug 2016 16:30:00 +0000 (16:30 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 8 Aug 2016 16:30:00 +0000 (16:30 +0000)
commitbf34accfce0635d088b47b3b37b2beab9f92398b
tree0fbce5cbdef2ee7af8b13cafac4a1d216914ef45
parentd83eee9445b4d5c65b91f67f2b1013358cc1d6d3
parent67d9c792a8122204775e2e18289fe1b7ce0c2693
Merge "Fixing NPE in device policy tests" into cw-f-dev
am: 67d9c792a8

Change-Id: I138f83d90318c9bb46a85b43b094aee62ce20b03