tree d1664be7d55317c0916926bae44912e7f50ddaf4
parent 1c4c608ea6fcb31256774954ac6bddfd3232c78d
parent 15861f6aa97aa54aef9d5fbb81bed2a2a46fe98e
author Zhizhou Yang <zhizhouy@google.com> 1513224801 +0000
committer android-build-merger <android-build-merger@google.com> 1513224801 +0000

Merge "Update diff files which break benchmark suite" am: 8e6687fd5e am: 4d0421beb2
am: 15861f6aa9

Change-Id: Ic0696d6c3db0f65c8df865055d125e20dda45ffd