am c49a37d6: am 0e3b339b: (-s ours) am 2fbae482: am c672cb07: Merge "Include the error code if GetPipeProperties fails."

* commit 'c49a37d69c9bc68603dd5d23581ad4891254089e':
This commit is contained in:
Elliott Hughes 2015-08-27 14:32:20 +00:00 committed by Android Git Automerger
commit a0a353a855

Diff content is not available