OSDN Git Service

Merge "Fix KeyguardUpdateMonitor test" into pi-dev
authorLucas Dupin <dupin@google.com>
Wed, 16 May 2018 21:07:08 +0000 (14:07 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 16 May 2018 21:07:08 +0000 (14:07 -0700)
commitdbe6d50990ec7e85f64b8db0d96db08205eeebb7
tree9611ee4d71e16c69edd4fb0b82db63cddbed0ffc
parent89be831c4665d4f9a70438537468a324a69ae47e
parent8f4bed7de7afcf98fd67723cbae5bf5ff7cb506a
Merge "Fix KeyguardUpdateMonitor test" into pi-dev
am: 8f4bed7de7

Change-Id: Idab6e96c851260854a6b240cc8b163b08e7e1c68