| commit | 0612a84a6b7c3488104e06664153bc99eed6b4ac | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <android-build-merger@google.com> | Fri Jun 16 01:24:54 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Jun 16 01:25:00 2017 +0000 |
| tree | 86749049c6346d66f6af1b5ed93a4c78fadeacc1 | |
| parent | 0fe3da04016ecffa71ff1390dfa42a78578887da [diff] | |
| parent | 4a0e5abe0e8f36b50021bb4aa90dda26a78b08ad [diff] |
Merge "Merge "Don't even think about changing keyguard transit" into oc-dev am: 3e3bb5f762 am: 69a4e37d19" into oc-dr1-dev-plus-aosp