commit | 69a4e37d19542a9a88c939b7a61f0c3de39b5c1b | [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 | b6c2517f960f1c26aa5364bb1ab5c005df85b529 | |
parent | 216bd4fa6f1fabef0bccb7ee69ce1608a250ac42 [diff] | |
parent | 3e3bb5f7625f92c79966c7def6df730b74305a1e [diff] |
Merge "Don't even think about changing keyguard transit" into oc-dev am: 3e3bb5f762 Change-Id: Ib73ffbe26038c8c29ee520ea461499875e4d23f5