Skip to content
Commit cc26e92b authored by Xiaowen Lei's avatar Xiaowen Lei Committed by Automerger Merge Worker
Browse files

[automerger skipped] Merge "Add AppTransition type and remote animation for... 

[automerger skipped] Merge "Add AppTransition type and remote animation for Dream in occluding Keyguard." into tm-qpr-dev am: f8e4efcc am: c3bebf9f -s ours

am skip reason: Merged-In I5517ded2eea77ea962ca1551ed51dd997ff09993 with SHA-1 71223c6e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19469267



Change-Id: I4bd11768b5e4d35e8a633913421cdb8392c58016
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b0ac7831 c3bebf9f
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