tree b12a0e6ddf26cefc7c46948d23bc4489fd79a892
parent 30ed5b99f55b759b2aa0f95cfd457ea0ffbd8bf4
parent 842f2d8ccf4a5675b30a85e41aa3c391195e644b
author Tao Bao <tbao@google.com> 1456204335 +0000
committer android-build-merger <android-build-merger@google.com> 1456204335 +0000

Merge "Control fault injection with config files instead of build flags" am: ed796b046d am: 24b3622933
am: 842f2d8ccf

* commit '842f2d8ccf4a5675b30a85e41aa3c391195e644b':
  Control fault injection with config files instead of build flags