| commit | 0b4938eae8102c5c4c81fc90c4518ef0f1ef33fd | [log] [tgz] |
|---|---|---|
| author | Eino-Ville Talvala <etalvala@google.com> | Fri Jan 15 01:07:53 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Jan 15 01:07:53 2016 +0000 |
| tree | e757172164fb43a787e0a3a863d18172637b865c | |
| parent | f0b0a7c7bb61d6ea9f8f89c55368529711d18e1a [diff] | |
| parent | 9dacf2727c5919faea7cc103eeedfceceeff83b6 [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 * commit '9dacf2727c5919faea7cc103eeedfceceeff83b6': Camera: Disallow dumping clients directly