am d524220c: Merge changes I83981ce2,I352ca1a1 into jb-mr1-dev
authorDima Zavin <dmitriyz@google.com>
Tue, 18 Sep 2012 23:54:47 +0000 (16:54 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 18 Sep 2012 23:54:47 +0000 (16:54 -0700)
commit6352ccaf8fb4ae2dd93bcfdbc417e1047888c2ab
tree5c9ab4e5ec820101ad8957059be6bd07afef8849
parent2948811ae37506ccf744cb6cb29244bc9093448a
parentd524220ccc389e317012a894fd790ec275587187
am d524220c: Merge changes I83981ce2,I352ca1a1 into jb-mr1-dev

* commit 'd524220ccc389e317012a894fd790ec275587187':
  hardware: samsung_slsi: exynos5: Seperate Secure memory region
  mobicore : Added external variable for DRM library