From: Chien-Yu Chen <cychen@google.com>
Date: Thu, 28 Jan 2016 02:04:44 +0000 (+0000)
Subject: Merge changes from topic 'camera-hardening'
X-Git-Tag: android-x86-7.1-r1~581
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=c19f9a1f088966369f2540cfa29e8ff8886da05a;p=android-x86%2Fframeworks-native.git

Merge changes from topic 'camera-hardening'

* changes:
  media: Add a metadata type for native handle from camera
  Restart cameraserver when servicemanager restarts
---

c19f9a1f088966369f2540cfa29e8ff8886da05a