am 9423fb23: (-s ours) am f2985ed8: Merge "Fix test steps for 64-bit bionic"

* commit '9423fb23757a0d6d4f112a3f231717896444207b':
This commit is contained in:
Dan Albert 2015-08-27 05:05:57 +00:00 committed by Android Git Automerger
commit 79697a7096

Diff Content Not Available