Commit 19306cb4 authored by Hiroki Yamamoto's avatar Hiroki Yamamoto Committed by android-build-merger
Browse files

Merge "Keep screen on during detecting some NFC devices" 

am: 568b77ff

Change-Id: Ided3b8298ccf7665605652f262be8954e213bf4e
parents 380746a5 568b77ff
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