tree e3cfe7417bd136b2d7c6476644cbecb31a989749
parent d1b66ad6a117188751b1342d77edb9756a00ae87
parent ed796b046daf574b1f4f9ef386a870c845457277
author Tao Bao <tbao@google.com> 1456203459 +0000
committer android-build-merger <android-build-merger@google.com> 1456203459 +0000

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

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