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