tree edea31e7dee34ee19643d9a9210d4bc429c837eb
parent 7c87997635dba938f38882f2e2331e9ef00dcb86
parent f43ff43a18199fbc7b3347534f6eabd5fda7839a
author Chih-hung Hsieh <chh@google.com> 1445963924 +0000
committer android-build-merger <android-build-merger@google.com> 1445963924 +0000

Merge "Disable clang until emulated TLS is there."
am: f43ff43a18

* commit 'f43ff43a18199fbc7b3347534f6eabd5fda7839a':
  Disable clang until emulated TLS is there.