| commit | 0fefc974ff78acd66429b750b7131b0425b1ede3 | [log] [tgz] |
|---|---|---|
| author | Eino-Ville Talvala <etalvala@google.com> | Fri Jan 15 00:15:12 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Jan 15 00:15:12 2016 +0000 |
| tree | ad1ad1a1787ca9fa8603b766f33ff31a498f653c | |
| parent | a8ac8f617b2df8f07935d3e1e47189dee2381b88 [diff] | |
| parent | 899823966e78552bb6dfd7772403a4f91471d2b0 [diff] |
resolve merge conflicts of 88b736a198 to lmp-dev. am: 899823966e * commit '899823966e78552bb6dfd7772403a4f91471d2b0': Camera: Disallow dumping clients directly