| commit | 2da2f1b383a00cb9919807867a9583fe09f1a449 | [log] [tgz] |
|---|---|---|
| author | Eino-Ville Talvala <etalvala@google.com> | Fri Jan 15 00:42:47 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Jan 15 00:42:47 2016 +0000 |
| tree | c9a4ed77bfc9c2d5b677ffb4943e657b215e04e1 | |
| parent | c4003965258404a19b99280ac0f475e2f290bf27 [diff] | |
| parent | 6313e262f90683d46e4bdbe7b59df47c432b5772 [diff] |
resolve merge conflicts of 88b736a198 to lmp-dev. am: 899823966e am: 0fefc974ff am: 295a488e49 am: 1ab7985b88 am: 6313e262f9 -s ours * commit '6313e262f90683d46e4bdbe7b59df47c432b5772': Camera: Disallow dumping clients directly