commit | 12e99678856977b66fb68657df19ce5f3c77d933 | [log] [tgz] |
---|---|---|
author | Jorim Jaggi <jjaggi@google.com> | Fri Jun 16 01:13:34 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Jun 16 01:13:34 2017 +0000 |
tree | ce4029574b8f46022096897be013d7705ee7bcf9 | |
parent | 3d268c9b7b0579ace81be7a7ac86d4e1259e57d3 [diff] | |
parent | 3e3bb5f7625f92c79966c7def6df730b74305a1e [diff] |
Merge "Don't even think about changing keyguard transit" into oc-dev am: 3e3bb5f762 Change-Id: I5ad8b077de7bbe692ac22e07fd2fb7ccb9264500