tree d1664be7d55317c0916926bae44912e7f50ddaf4
parent f8e70db2d988d8ab04cbc7890d108be05e86e516
parent 8e6687fd5e94f9d7da626764419eb8948aacccb2
author Zhizhou Yang <zhizhouy@google.com> 1513224166 +0000
committer android-build-merger <android-build-merger@google.com> 1513224166 +0000

Merge "Update diff files which break benchmark suite"
am: 8e6687fd5e

Change-Id: I598a6256a480b8c0cb84ddac7452145636cc5f44