OSDN Git Service

am 4bc3c8bd: Merge "SampleTrustAgent: Exercise KeyguardManager.isKeyguardInTrustedSta...
authorAdrian Roos <roosa@google.com>
Mon, 27 Oct 2014 20:36:25 +0000 (20:36 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 27 Oct 2014 20:36:25 +0000 (20:36 +0000)
commitf9b36d5ef94c92a66c08167d5e7e911e5ea8c645
tree56f3353742a755a88be84af9422644550efff98d
parent97f1a97d89366159374c2be3d74e0642705d80bf
parent4bc3c8bd643ca6840bf5b3fe01d8221f3a389d96
am 4bc3c8bd: Merge "SampleTrustAgent: Exercise KeyguardManager.isKeyguardInTrustedState" into lmp-mr1-dev

* commit '4bc3c8bd643ca6840bf5b3fe01d8221f3a389d96':
  SampleTrustAgent: Exercise KeyguardManager.isKeyguardInTrustedState