tree b5dcde35107d6b6f855356b8c66153ad9abb666c
parent 4a87753ad30a60194a9c5466d72600c423fe2ba3
parent 8c9803af0ec9cb1d0037b7894cb09f829da1db87
author Zhizhou Yang <zhizhouy@google.com> 1504060594 +0000
committer android-build-merger <android-build-merger@google.com> 1504060594 +0000

Merge "Fix bug patching panorama benchmark"
am: 8c9803af0e

Change-Id: I14b17c5be5e1ba27b443ef28424d7304b826d746