Skip to content
Commit 0b78b922 authored by Sanket Agarwal's avatar Sanket Agarwal Committed by android-build-merger
Browse files

resolve merge conflicts of 9eb77405 to nyc-dev-plus-aosp 

am: 950abbd0

* commit '950abbd0':
  While turning OFF do not honor ON requests.

Change-Id: I5bbda2536bd0f33dad2d2b07b24acfb91f27a1ce
parents 90ac2096 950abbd0
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