| commit | b7525da9a6d65cc50bfa5fb150a8060b9c8c0955 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Aug 27 11:51:22 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 11:51:22 2015 +0000 |
| tree | 8c31250a527d15d67e52f8d8871ae6062178ee22 | |
| parent | 2acbf47f8153719968ca870fb9289a694aa7f732 [diff] | |
| parent | 3310cb4b239d9b3a4de80c8b295078f1e1602f79 [diff] |
am 0e3b339b: (-s ours) am 2fbae482: am c672cb07: Merge "Include the error code if GetPipeProperties fails." * commit '0e3b339bbb43a058b4c8397655b31d774b9e1d3a':