tree 559c539fa0b37cbfadb26b5ba8ea3269ba13d18a
parent 8085b38c18247a46cbe944cae4f35fbe9e9d47ba
parent c52b853194553dae146bf19b9279b6290fe8c678
author Jed Estep <jestep@google.com> 1458936563 +0000
committer android-build-merger <android-build-merger@google.com> 1458936563 +0000

Merge "Correct caching behavior for should_inject_cache" am: 9afbf2a
am: c52b853

* commit 'c52b853194553dae146bf19b9279b6290fe8c678':
  Correct caching behavior for should_inject_cache