Skip to content
Commit 3a3ed84c authored by Matt Pietal's avatar Matt Pietal Committed by Automerger Merge Worker
Browse files

Merge changes I1dbd1fd7,I4fb6c38d into tm-qpr-dev am: 7807fa25 

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



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