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