| commit | 2e2cfd6158d8aded0effc3a1395c2731e2750841 | [log] [tgz] |
|---|---|---|
| author | Christopher Wiley <wiley@google.com> | Fri Feb 19 22:22:52 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Feb 19 22:22:52 2016 +0000 |
| tree | cc4bf96e2d2fcd0b42e409852b53a298074c18c5 | |
| parent | cfeaf775fe6da367a982dbc4db902f5803553c09 [diff] | |
| parent | cf34799f702fca5cb6fabd185650c265c08c8b2e [diff] |
Merge "brillo: Don\'t even try contacting the camera proxy" am: 15ca784102 am: cf34799f70 * commit 'cf34799f702fca5cb6fabd185650c265c08c8b2e': brillo: Don't even try contacting the camera proxy