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