tree 4cc9774a001451c9d9ed7fc6e83448ca5a806377
parent a449d857143df38a71a37417c0254fd7181ac7a7
parent 53ae4dbf8cb93a33d748118c19116dfaa25576d4
author Jason Monk <jmonk@google.com> 1494442474 +0000
committer android-build-merger <android-build-merger@google.com> 1494442474 +0000

Merge "Disable parts of tuner from user builds" into oc-dev
am: 53ae4dbf8c

Change-Id: I7409558792e77fa16f0e4b95fdf7ae40e59ed1ed