Skip to content
Commit 54f40fa1 authored by Jorim Jaggi's avatar Jorim Jaggi Committed by Android (Google) Code Review
Browse files

Merge changes I36ec1bf3,Ic5f11074 into oc-mr1-dev 

* changes:
  Fix transition between two occluding activities
  Use Keyguard orientation when unoccluding
parents 55309e79 791ccc00
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment