OSDN Git Service

Merge "Merge "Don't even think about changing keyguard transit" into oc-dev am: 3e3bb...
authorJorim Jaggi <jjaggi@google.com>
Fri, 16 Jun 2017 01:34:45 +0000 (01:34 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 16 Jun 2017 01:34:45 +0000 (01:34 +0000)
am: 0612a84a6b

Change-Id: I2267934054146beb1391eb1be91f2098e648c7f0


Trivial merge