tree 9e728cea2ec2086195ecbbe22b840d1631991673
parent 9ade9e6c418aacfcab3e1ec487c8c5c327b7a007
parent 24b3622933092c7227a391939f3f1cdcd3d7c999
author Tao Bao <tbao@google.com> 1456203882 +0000
committer android-build-merger <android-build-merger@google.com> 1456203882 +0000

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

* commit '24b3622933092c7227a391939f3f1cdcd3d7c999':
  Control fault injection with config files instead of build flags