Commit 1670a387 authored by Nicolas Geoffray's avatar Nicolas Geoffray Committed by android-build-merger
Browse files

Merge "Stop-gap for buildbot and golem testing." am: c5fb897a 

am: 11a98a23

Change-Id: I8d3d6060ae77a17c65de1dde3eb20cc61e6ed096
parents 41b7c164 11a98a23
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment