From: Eric Laurent <elaurent@google.com>
Date: Mon, 3 Nov 2014 21:18:07 +0000 (+0000)
Subject: am 42f785c5: am 4fbe49a8: am 96016c2d: am 9944ff09: am 70c3507d: am 450b10c9: am... 
X-Git-Tag: android-x86-6.0-r1~852^2~155^2~1
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=9c0c41ff36926030778a8a41210d02602c5a9f62;p=android-x86%2Fframeworks-av.git

am 42f785c5: am 4fbe49a8: am 96016c2d: am 9944ff09: am 70c3507d: am 450b10c9: am d0f9dc71: am e0a65f30: am f5af3a72: am 6d80b687: audio policy: validate stream type received from binder calls. automerge: ca83dd2
automerge: ba30b45

* commit 'ba30b4547c6b7ca949ef74e760ccc6157f435690':
---

9c0c41ff36926030778a8a41210d02602c5a9f62