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

Browse Source

am: 950abbd075

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

Change-Id: I5bbda2536bd0f33dad2d2b07b24acfb91f27a1ce

...

This commit is contained in:

Sanket Agarwal

2016-06-03 18:49:24 +00:00

committed by android-build-merger

parent 90ac2096fc 950abbd075

commit 0b78b922dc

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available