| commit | 0fe3da04016ecffa71ff1390dfa42a78578887da | [log] [tgz] |
|---|---|---|
| author | Jorim Jaggi <jjaggi@google.com> | Fri Jun 16 01:22:35 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Jun 16 01:22:35 2017 +0000 |
| tree | 86749049c6346d66f6af1b5ed93a4c78fadeacc1 | |
| parent | d59b0c4d48a716245f3c28a6124d47961f2cd776 [diff] | |
| parent | 12e99678856977b66fb68657df19ce5f3c77d933 [diff] |
Merge "Don't even think about changing keyguard transit" into oc-dev am: 3e3bb5f762 am: 12e9967885 Change-Id: Id8d5f6523d51fd5ffcd019ab9a3f898f55ea2180