tree 05e2a21aec38fd8041d297a20a755b5018a57d51
parent 95877da925fdd7dbb268b29fb906071891d40260
parent d4d1512b64df37157f3fa9c205f1dd3738b47e21
author Svet Ganov <svetoslavganov@google.com> 1462239654 +0000
committer android-build-merger <android-build-merger@google.com> 1462239654 +0000

Merge "Disable unused features" into nyc-dev
am: d4d1512b64

* commit 'd4d1512b64df37157f3fa9c205f1dd3738b47e21':
  Disable unused features

Change-Id: I1e4e6a9718b4a53827bf7d7dc3da92b7acab7f7f