| commit | b422ca9dade2b7a05566ea2259d2be775fb32c1a | [log] [tgz] |
|---|---|---|
| author | Jorim Jaggi <jjaggi@google.com> | Fri Jun 16 01:34:45 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Jun 16 01:34:45 2017 +0000 |
| tree | 4a5922f77663008a277045c4116892484ceff3a6 | |
| parent | 32655fcb3416c4c2c450f2346b9be76e6609f674 [diff] | |
| parent | 0612a84a6b7c3488104e06664153bc99eed6b4ac [diff] |
Merge "Merge "Don't even think about changing keyguard transit" into oc-dev am: 3e3bb5f762 am: 69a4e37d19" into oc-dr1-dev-plus-aosp am: 0612a84a6b Change-Id: I2267934054146beb1391eb1be91f2098e648c7f0