tree 5b5406fd0f0f7da1b410d17ca2c3d7bd967d1bfb
parent 4ebbfef3cf54134e934d1b18dbae42f688e4a35f
parent b273217c6e2e2f0302722f3474ec0a3224bd7d7e
author Lucas Dupin <dupin@google.com> 1523301893 -0700
committer android-build-merger <android-build-merger@google.com> 1523301893 -0700

Merge "Remove focus highlight from scrims" into pi-dev
am: b273217c6e

Change-Id: I417f46a3912229023612ab2dbaac95455024547a