| commit | 0b78b922dc405d7f77a0ed0e3b5b1a03941b348b | [log] [tgz] |
|---|---|---|
| author | Sanket Agarwal <sanketa@google.com> | Fri Jun 03 18:49:24 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Jun 03 18:49:24 2016 +0000 |
| tree | 2f683b303b48022502f9ef6d49396b55f2264ba8 | |
| parent | 90ac2096fc0d00472f2d66600e98fdbf5799d1b0 [diff] | |
| parent | 950abbd0751e863364a1ad976713a959bcb2dc8c [diff] |
resolve merge conflicts of 9eb77405 to nyc-dev-plus-aosp am: 950abbd075 * commit '950abbd0751e863364a1ad976713a959bcb2dc8c': While turning OFF do not honor ON requests. Change-Id: I5bbda2536bd0f33dad2d2b07b24acfb91f27a1ce