Skip to content
Commit 66b936d9 authored by Mady Mellor's avatar Mady Mellor Committed by Automerger Merge Worker
Browse files

Merge changes Ie7aaec55,I3053cdb6 into sc-v2-dev am: 57a3e448 am: efc97e36 

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

Change-Id: I2b90171df59cdbf4514bc4e609f09d98bbabe588
parents 69d46fa9 efc97e36
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