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)
am: 8f4bed7de7

Change-Id: Idab6e96c851260854a6b240cc8b163b08e7e1c68


Trivial merge