Skip to content
Commit 9136f4f6 authored by Pavlin Radoslavov's avatar Pavlin Radoslavov Committed by android-build-merger
Browse files

resolve merge conflicts of 9eb77405 to nyc-dev-plus-aosp am: 950abbd0 

am: 0b78b922

* commit '0b78b922':
  While turning OFF do not honor ON requests.

Change-Id: I6839b7f01ebef00a7eb331842bc943617ec11cef
parents bd398d6c 0b78b922
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