| commit | 813ac23bee5b3519c2b7f410a2b24b3a94075b22 | [log] [tgz] |
|---|---|---|
| author | Eino-Ville Talvala <etalvala@google.com> | Fri Jan 15 01:10:33 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Jan 15 01:10:33 2016 +0000 |
| tree | 8d21b188753f55c475040495c0abf078b5971258 | |
| parent | 715e5cdec771abb372d46813a8b0ab57d47afd99 [diff] | |
| parent | 0b4938eae8102c5c4c81fc90c4518ef0f1ef33fd [diff] |
resolve merge conflicts of 88b736a198 to lmp-dev. am: 899823966e am: 0fefc974ff am: 295a488e49 am: 1ab7985b88 am: 6313e262f9 -s ours am: 2da2f1b383 am: eab078d0b1 am: 240c2126e4 am: 9dacf2727c am: 0b4938eae8 * commit '0b4938eae8102c5c4c81fc90c4518ef0f1ef33fd': Camera: Disallow dumping clients directly