| commit | add919b1f5c86d1ea1c34ccf6936fb990d06b37b | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <android-build-merger@google.com> | Fri Jun 16 01:35:43 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Jun 16 01:35:48 2017 +0000 |
| tree | 8a1aeae1c9968f3598c815b2a66cc9617cab2639 | |
| parent | cb3b80d3f9a9f5f7d466669a857a06cee383b71f [diff] | |
| parent | b422ca9dade2b7a05566ea2259d2be775fb32c1a [diff] |
Merge "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"