diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2016-01-15 00:59:31 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-01-15 00:59:31 +0000 |
| commit | 9dacf2727c5919faea7cc103eeedfceceeff83b6 (patch) | |
| tree | e757172164fb43a787e0a3a863d18172637b865c /media/libmedia | |
| parent | 3a0d1df37df09b0fbbc7b9768c6f7d530fd7a024 (diff) | |
| parent | 240c2126e491eb3f3d3ffce35bc1fd33e9e350b4 (diff) | |
| download | frameworks_av-9dacf2727c5919faea7cc103eeedfceceeff83b6.zip frameworks_av-9dacf2727c5919faea7cc103eeedfceceeff83b6.tar.gz frameworks_av-9dacf2727c5919faea7cc103eeedfceceeff83b6.tar.bz2 | |
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
* commit '240c2126e491eb3f3d3ffce35bc1fd33e9e350b4':
Camera: Disallow dumping clients directly
Diffstat (limited to 'media/libmedia')
0 files changed, 0 insertions, 0 deletions