OSDN Git Service

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

Change-Id: I5ad8b077de7bbe692ac22e07fd2fb7ccb9264500