| commit | 32655fcb3416c4c2c450f2346b9be76e6609f674 | [log] [tgz] |
|---|---|---|
| author | Jorim Jaggi <jjaggi@google.com> | Fri Jun 16 01:33:15 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Jun 16 01:33:15 2017 +0000 |
| tree | 4a5922f77663008a277045c4116892484ceff3a6 | |
| parent | a575b68b03ddd014b8ef5969f7cfeca6898de856 [diff] | |
| parent | 0fe3da04016ecffa71ff1390dfa42a78578887da [diff] |
Merge "Don't even think about changing keyguard transit" into oc-dev am: 3e3bb5f762 am: 12e9967885 am: 0fe3da0401 Change-Id: I866ff446d7ed705ccb8b4bce2df79e5462a4daa9