| commit | ffab7e73b7a6eebe3bbc5cf51e6a86a48dfa8c28 | [log] [tgz] |
|---|---|---|
| author | Yin-Chia Yeh <yinchiayeh@google.com> | Fri Jul 10 18:11:41 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jul 10 18:11:41 2015 +0000 |
| tree | ffa324f875c63e2598d47d344a9786df47d62c41 | |
| parent | 9462bf2c1aae4c05a1edc2e955a9b18dccc3732e [diff] | |
| parent | 7e2a819107157ef4f6df9dd0bc60b9d0ac85e458 [diff] |
am 7e2a8191: am 828478c7: am 7f2ecbd4: resolved conflicts for merge of e25c956d to mnc-dev * commit '7e2a819107157ef4f6df9dd0bc60b9d0ac85e458': Fix android.hardware.camera2.cts.RobustnessTest#testMandatoryOutputCombinations failure.