Commit a59fcbec authored by carrie xu's avatar carrie xu Committed by android-build-merger
Browse files

Merge "Don't keep screen on during read tag on locked screen" am: b5bc349c am: 0af048a6 

am: 90b6b024

Change-Id: Ic72fb9f2f15d7a05bbd825ecca4c51482e850fac
parents 93eeadcc 90b6b024
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment