| commit | 60ff9e5543ea1adada1d2c2a043d20aadbd30171 | [log] [tgz] |
|---|---|---|
| author | Eino-Ville Talvala <etalvala@google.com> | Fri Jan 15 01:27:05 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Jan 15 01:27:05 2016 +0000 |
| tree | 9108dbd203574f12a5e0b50e5f669eecb1a2e2c3 | |
| parent | c73e0410c6b931fe598061b2f348834da0a21707 [diff] | |
| parent | 813ac23bee5b3519c2b7f410a2b24b3a94075b22 [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 am: 813ac23bee * commit '813ac23bee5b3519c2b7f410a2b24b3a94075b22': Camera: Disallow dumping clients directly