tree 31fb8d86d7d238dced02c12753472b0452c3d761
parent 7fbbbcf1ac6946c5ab944c1b739a9468a86e1378
parent f12249def772d4cc5e176b0534a5a5e9d2eab79b
author Esteban de la Canal <estebandlc@google.com> 1438387259 +0000
committer android-build-merger <android-build-merger@google.com> 1438387259 +0000

Merge "If HAX is running, don\'t print to stderr" into studio-1.4-dev
automerge: f12249d

* commit 'f12249def772d4cc5e176b0534a5a5e9d2eab79b':
  If HAX is running, don't print to stderr